diff -r 9ebed1e95ef7 -r 629558d09898 tests/test-evolve-phase-divergence.t
--- a/tests/test-evolve-phase-divergence.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-evolve-phase-divergence.t	Fri Jun 15 00:16:29 2018 +0530
@@ -792,8 +792,8 @@
   rebasing to destination parent: 8c2bb6fb44e9
   merging x
   warning: conflicts while merging x! (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 diff
   diff -r 8c2bb6fb44e9 l