tests/test-merge-tools.t

--- a/tests/test-merge-tools.t	Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-merge-tools.t	Wed Nov 16 18:04:19 2011 -0600
@@ -66,7 +66,7 @@
   $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
   merging f
   warning: conflicts during merge.
-  merging f failed!
+  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]