diff -r 9ebed1e95ef7 -r 629558d09898 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-stabilize-result.t	Fri Jun 15 00:16:29 2018 +0530
@@ -81,8 +81,8 @@
   atop:[5] changea
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
   $ hg revert -r "orphan()" a
   $ hg diff
   diff -r 66719795a494 a
@@ -390,8 +390,8 @@
   merging a
   warning: conflicts while merging a! (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]
 
   $ cat > a <<EOF
   > jungle