--- a/tests/test-rebase-abort.t Mon Nov 01 10:24:07 2010 +0100
+++ b/tests/test-rebase-abort.t Sat Oct 30 16:58:15 2010 -0500
@@ -50,7 +50,7 @@
merging common
warning: conflicts during merge.
merging common failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Abort:
@@ -118,7 +118,7 @@
merging c
warning: conflicts during merge.
merging c failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
$ hg tglog