branch | stable |
changeset 10672 | c2e1e637d4da |
parent 9110 | 561ff8d9e4f0 |
child 11047 | c7dbd6c4877a |
--- a/tests/test-rebase-mq.out Fri Mar 05 17:38:02 2010 -0500 +++ b/tests/test-rebase-mq.out Tue Mar 02 15:08:43 2010 -0500 @@ -11,6 +11,9 @@ % Rebase - try to rebase on an applied mq patch abort: cannot rebase onto an applied mq patch +% Rebase - same thing, but mq patch is default dest +abort: cannot rebase onto an applied mq patch + % Rebase - generate a conflict merging f warning: conflicts during merge.