--- a/tests/test-evolve-stop-contentdiv.t Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-evolve-stop-contentdiv.t Fri Jun 15 00:16:29 2018 +0530
@@ -75,8 +75,8 @@
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
- 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
@@ -129,8 +129,8 @@
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
- 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