--- a/tests/test-keyword.t	Wed Nov 16 03:45:14 2011 +0100
+++ b/tests/test-keyword.t	Wed Nov 16 18:04:19 2011 -0600
@@ -976,7 +976,7 @@
   $ hg merge
   merging m
   warning: conflicts during merge.
-  merging m failed!
+  merging m 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]