diff -r b293cce4ff55 -r f0096db2a7b1 tests/test-evolve.t
--- a/tests/test-evolve.t	Tue Jun 12 04:01:19 2018 +0530
+++ b/tests/test-evolve.t	Tue Jun 12 19:00:12 2018 +0530
@@ -1535,9 +1535,7 @@
   atop:[38] will be evolved safely
   merging newfile
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
-  evolve failed!
-  see `hg help evolve.interrupted`
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ glog -r "be23044af550::" --hidden