diff -r 9ebed1e95ef7 -r 629558d09898 tests/test-evolve-stop-phasediv.t
--- a/tests/test-evolve-stop-phasediv.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-evolve-stop-phasediv.t	Fri Jun 15 00:16:29 2018 +0530
@@ -84,8 +84,8 @@
   rebasing to destination parent: ca1b80f7960a
   merging c
   warning: conflicts while merging c! (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 evolve --stop
   stopped the interrupted evolve