diff -r 9ebed1e95ef7 -r 629558d09898 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Jun 15 00:16:29 2018 +0530
@@ -128,8 +128,8 @@
   atop:[5] babar count up to ten
   merging babar
   warning: conflicts while merging babar! (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 resolve -l
   U babar
   $ hg log -G
@@ -220,8 +220,8 @@
    output file babar appears unchanged
   was merge successful (yn)? n
   merging babar failed!
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
   $ hg resolve -l
   U babar
   $ hg log -G