--- a/tests/test-evolve-abort-phasediv.t Fri Jun 07 02:25:02 2019 +0200
+++ b/tests/test-evolve-abort-phasediv.t Thu Jun 06 17:37:42 2019 +0800
@@ -87,7 +87,8 @@
rebasing to destination parent: ca1b80f7960a
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]
testing that interrupted evolve shows up in morestatus
@@ -213,7 +214,8 @@
rebasing to destination parent: b1661037fa25
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
- fix conflicts and see `hg help evolve.interrupted`
+ unresolved merge conflicts
+ (see 'hg help evolve.interrupted')
[1]
$ hg evolve --abort
@@ -282,7 +284,8 @@
rebasing to destination parent: b1661037fa25
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
- fix conflicts and see `hg help evolve.interrupted`
+ unresolved merge conflicts
+ (see 'hg help evolve.interrupted')
[1]
$ echo watwat > c
@@ -297,7 +300,8 @@
rebasing to destination parent: ca1b80f7960a
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]
$ hg evolve --abort