changeset 18935 | e5d9441ec281 |
parent 18933 | 42b620fc89e2 |
child 20117 | aa9385f983fa |
--- a/tests/test-rebase-mq-skip.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-rebase-mq-skip.t Fri Feb 08 16:17:46 2013 -0600 @@ -109,7 +109,7 @@ $ HGMERGE=internal:fail hg rebase unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] $ HGMERGE=internal:local hg resolve --all