--- a/tests/test-rebase-mq.t Fri Feb 08 16:28:24 2013 -0600
+++ b/tests/test-rebase-mq.t Fri Feb 08 16:27:59 2013 -0600
@@ -63,7 +63,7 @@
merging f
warning: conflicts during merge.
merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
- abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Fix the 1st conflict:
@@ -74,7 +74,7 @@
merging f
warning: conflicts during merge.
merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
- abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Fix the 2nd conflict: