--- a/tests/test-evolve-orphan-merge.t Fri Jun 07 02:25:02 2019 +0200
+++ b/tests/test-evolve-orphan-merge.t Thu Jun 06 17:37:42 2019 +0800
@@ -219,7 +219,8 @@
atop:[11] foo to c
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- fix conflicts and see `hg help evolve.interrupted`
+ unresolved merge conflicts
+ (see 'hg help evolve.interrupted')
[1]
$ echo FOObar > c
@@ -274,7 +275,8 @@
atop:[13] foo to c
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- fix conflicts and see `hg help evolve.interrupted`
+ unresolved merge conflicts
+ (see 'hg help evolve.interrupted')
[1]
$ echo foobar > c