--- a/tests/test-evolve.t	Fri Oct 30 16:04:37 2015 +0000
+++ b/tests/test-evolve.t	Fri Oct 30 15:48:13 2015 +0000
@@ -592,8 +592,7 @@
   $ hg graft -O 7
   grafting 7:a5bfd90a2f29 "conflict" (tip)
   merging 1
-  warning: conflicts during merge.
-  merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use hg resolve and hg graft --continue)
   [255]