changeset 15267 | 3bfdfefea2fc |
parent 15132 | 81f76098211e |
child 15270 | 6cb6064f1d50 |
--- a/tests/test-rebase-parameters.t Sat Oct 15 10:20:08 2011 -0500 +++ b/tests/test-rebase-parameters.t Sat Oct 15 19:07:51 2011 +0200 @@ -51,8 +51,8 @@ $ cd a1 $ hg rebase -s 8 -d 7 - abort: source is a child of destination - [255] + nothing to rebase + [1] $ hg rebase --continue --abort abort: cannot use both abort and continue @@ -76,7 +76,7 @@ $ hg up -q 7 - $ hg rebase + $ hg rebase --traceback nothing to rebase [1]