branch | stable |
changeset 10672 | c2e1e637d4da |
parent 10397 | 8cb81d75730c |
child 11198 | b345b1cc124f |
--- a/tests/test-rebase-mq Fri Mar 05 17:38:02 2010 -0500 +++ b/tests/test-rebase-mq Tue Mar 02 15:08:43 2010 -0500 @@ -45,6 +45,12 @@ hg rebase -s 1 -d 3 echo +echo '% Rebase - same thing, but mq patch is default dest' +hg update -q 1 +hg rebase +hg update -q qtip + +echo echo '% Rebase - generate a conflict' hg rebase -s 2 -d 1