--- a/tests/test-rebase-conflicts.t	Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-rebase-conflicts.t	Wed Nov 16 18:04:19 2011 -0600
@@ -58,7 +58,7 @@
   $ hg rebase -s 3 -d 2
   merging common
   warning: conflicts during merge.
-  merging common failed!
+  merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
   abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]