diff -r acfc610ec304 -r b1809340478b tests/test-evolve.t
--- a/tests/test-evolve.t	Wed Feb 01 15:45:20 2017 +0100
+++ b/tests/test-evolve.t	Wed Feb 01 15:51:02 2017 +0100
@@ -593,7 +593,8 @@
   $ hg graft -O 7
   grafting 7:a5bfd90a2f29 "conflict" (tip)
   merging 1
-  warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use hg resolve and hg graft --continue)
   [255]
@@ -1442,7 +1443,8 @@
   move:[39] will cause conflict at evolve
   atop:[42] will be evolved safely
   merging newfile
-  warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
+  warning: conflicts during merge.
+  merging newfile 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)