--- a/tests/test-mq-qnew.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-mq-qnew.t Wed Nov 16 18:04:19 2011 -0600
@@ -155,7 +155,7 @@
created new head
merging a
warning: conflicts during merge.
- merging a failed!
+ merging a 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
abort: cannot manage merge changesets
@@ -228,7 +228,7 @@
created new head
merging a
warning: conflicts during merge.
- merging a failed!
+ merging a 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
abort: cannot manage merge changesets