--- a/tests/test-stabilize-result.t Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-stabilize-result.t Thu Feb 04 11:07:44 2016 +0000
@@ -82,7 +82,8 @@
move:[5] newer a
atop:[7] changea
merging a
- warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
+ warning: conflicts during merge.
+ merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
evolve failed!
fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
abort: unresolved merge conflicts (see hg help resolve)
@@ -357,7 +358,8 @@
with: [21] More addition
base: [15] More addition
merging a
- warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
+ warning: conflicts during merge.
+ 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: merge conflict between several amendments (this is not automated yet)