--- a/tests/test-evolve-stop-orphan.t Tue Jun 12 04:01:19 2018 +0530
+++ b/tests/test-evolve-stop-orphan.t Tue Jun 12 19:00:12 2018 +0530
@@ -90,9 +90,7 @@
atop:[5] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- evolve failed!
- see `hg help evolve.interrupted`
- abort: unresolved merge conflicts (see hg help resolve)
+ abort: fix conflicts and see `hg help evolve.interrupted`
[255]
$ hg evolve --stop
@@ -138,9 +136,7 @@
atop:[5] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- evolve failed!
- see `hg help evolve.interrupted`
- abort: unresolved merge conflicts (see hg help resolve)
+ abort: fix conflicts and see `hg help evolve.interrupted`
[255]
$ hg diff
@@ -187,9 +183,7 @@
atop:[5] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- evolve failed!
- see `hg help evolve.interrupted`
- abort: unresolved merge conflicts (see hg help resolve)
+ abort: fix conflicts and see `hg help evolve.interrupted`
[255]
$ echo foo > d
$ hg resolve -m
@@ -240,9 +234,7 @@
atop:[9] added b
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- evolve failed!
- see `hg help evolve.interrupted`
- abort: unresolved merge conflicts (see hg help resolve)
+ abort: fix conflicts and see `hg help evolve.interrupted`
[255]
$ hg status
@@ -279,9 +271,7 @@
atop:[9] added b
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- evolve failed!
- see `hg help evolve.interrupted`
- abort: unresolved merge conflicts (see hg help resolve)
+ abort: fix conflicts and see `hg help evolve.interrupted`
[255]
$ echo foobar > c
@@ -357,9 +347,7 @@
atop:[13] added b
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- evolve failed!
- see `hg help evolve.interrupted`
- abort: unresolved merge conflicts (see hg help resolve)
+ abort: fix conflicts and see `hg help evolve.interrupted`
[255]
$ hg evolve --stop