tests/test-rebase-conflicts.t

--- a/tests/test-rebase-conflicts.t	Mon Nov 01 10:24:07 2010 +0100
+++ b/tests/test-rebase-conflicts.t	Sat Oct 30 16:58:15 2010 -0500
@@ -59,7 +59,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]
 
 Try to continue without solving the conflict: