diff -r dcf145d0ce21 -r 3c7f98753e37 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-stabilize-conflict.t	Thu Feb 04 11:01:35 2016 +0000
@@ -127,7 +127,8 @@
   move:[5] babar count up to fifteen
   atop:[7] babar count up to ten
   merging babar
-  warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging babar 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)