--- a/tests/test-evolve.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-evolve.t	Fri Jun 15 00:16:29 2018 +0530
@@ -1535,8 +1535,8 @@
   atop:[38] will be evolved safely
   merging newfile
   warning: conflicts while merging newfile! (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]
 
   $ glog -r "be23044af550::" --hidden
   @  38:61abd81de026@default(draft) will be evolved safely