changeset 18935 | e5d9441ec281 |
parent 18933 | 42b620fc89e2 |
child 19641 | 5528c31c629c |
--- a/tests/test-rebase-bookmarks.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-rebase-bookmarks.t Fri Feb 08 16:17:46 2013 -0600 @@ -142,7 +142,7 @@ warning: conflicts during merge. merging c incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] $ echo 'c' > c $ hg resolve --mark c $ hg rebase --continue