--- a/tests/test-evolve-orphan-merge.t Tue Jun 12 04:01:19 2018 +0530
+++ b/tests/test-evolve-orphan-merge.t Tue Jun 12 19:00:12 2018 +0530
@@ -219,9 +219,7 @@
atop:[11] foo to c
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
@@ -276,9 +274,7 @@
atop:[13] foo to c
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