--- a/tests/test-issue-5720.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-issue-5720.t	Fri Jun 15 00:16:29 2018 +0530
@@ -61,8 +61,8 @@
   atop:[3] b
   merging a
   warning: conflicts while merging a! (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]
 
 Fix the conflict
   $ echo c2 > a