diff -r 629558d09898 -r 796334340cad tests/test-evolve-stop-contentdiv.t
--- a/tests/test-evolve-stop-contentdiv.t	Fri Jun 15 00:16:29 2018 +0530
+++ b/tests/test-evolve-stop-contentdiv.t	Fri Jun 15 00:50:17 2018 +0530
@@ -178,8 +178,8 @@
   rebasing "other" content-divergent changeset 8fd1c4bd144c on ca1b80f7960a
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
-  abort: unresolved merge conflicts (see hg help resolve)
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ hg diff
   diff -r ca1b80f7960a c