diff -r dcf145d0ce21 -r 0d8973818980 tests/test-evolve.t
--- a/tests/test-evolve.t	Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-evolve.t	Thu Feb 04 11:07:44 2016 +0000
@@ -592,7 +592,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]