--- a/tests/test-evolve-continue.t	Tue Jun 12 04:01:19 2018 +0530
+++ b/tests/test-evolve-continue.t	Tue Jun 12 19:00:12 2018 +0530
@@ -58,9 +58,7 @@
   atop:[5] added c
   merging d
   warning: conflicts while merging d! (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]
 
   $ echo foo > d
@@ -117,9 +115,7 @@
   atop:[8] added d
   merging e
   warning: conflicts while merging e! (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]
 
   $ echo bar > e
@@ -158,9 +154,7 @@
   atop:[9] added a
   merging b
   warning: conflicts while merging b! (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]
 
   $ echo foo > b
@@ -246,9 +240,7 @@
   atop:[17] added d
   merging f
   warning: conflicts while merging f! (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]
 
   $ echo foo > f
@@ -263,9 +255,7 @@
   atop:[19] added g
   merging h
   warning: conflicts while merging h! (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]
 
   $ echo foo > h
@@ -311,9 +301,7 @@
   perform evolve? [Ny] y
   merging g
   warning: conflicts while merging g! (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]
 
   $ echo foo > g
@@ -363,9 +351,7 @@
   atop:[24] added f
   merging g
   warning: conflicts while merging g! (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]
   $ echo foo > g
   $ hg resolve -m