--- a/tests/test-merge9.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-merge9.t Wed Nov 16 18:04:19 2011 -0600
@@ -83,7 +83,7 @@
$ hg resolve -a
merging bar
warning: conflicts during merge.
- merging bar failed!
+ merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
[1]
after