changeset 28101 | 79437fb352ce |
parent 27626 | 157675d0f600 |
child 33332 | 3b7cb3d17137 |
--- a/tests/test-rebase-bookmarks.t Mon Feb 08 14:02:53 2016 +0100 +++ b/tests/test-rebase-bookmarks.t Mon Feb 08 14:03:45 2016 +0100 @@ -167,7 +167,7 @@ created new head $ hg up 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg rebase + $ hg rebase --dest 4 rebasing 3:3d5fa227f4b5 "C" (Y Z) merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark')