diff -r 9ebed1e95ef7 -r 629558d09898 tests/test-evolve-abort-contentdiv.t
--- a/tests/test-evolve-abort-contentdiv.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-evolve-abort-contentdiv.t	Fri Jun 15 00:16:29 2018 +0530
@@ -78,8 +78,8 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ hg status -v
   M d
@@ -177,8 +177,8 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ hg evolve --abort
   2 new content-divergent changesets
@@ -338,8 +338,8 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ hg evolve --abort
   evolve aborted