changeset 18933 | 42b620fc89e2 |
parent 17345 | 4f8054d3171b |
child 18935 | e5d9441ec281 |
--- a/tests/test-rebase-mq-skip.t Fri Feb 08 16:28:24 2013 -0600 +++ b/tests/test-rebase-mq-skip.t Fri Feb 08 16:27:59 2013 -0600 @@ -108,7 +108,7 @@ $ hg up -q qtip $ HGMERGE=internal:fail hg rebase - abort: unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see hg resolve, then hg rebase --continue) [255] $ HGMERGE=internal:local hg resolve --all