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