diff -r 9ebed1e95ef7 -r 629558d09898 tests/test-evolve-content-divergence.t
--- a/tests/test-evolve-content-divergence.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-evolve-content-divergence.t	Fri Jun 15 00:16:29 2018 +0530
@@ -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]
 
   $ echo foobar > d
   $ hg resolve -m
@@ -237,8 +237,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]
 
   $ echo watbar > d
   $ hg resolve -m
@@ -534,8 +534,8 @@
   merging y
   warning: conflicts while merging y! (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]
 
   $ echo watbar > y
   $ hg resolve -m