--- a/tests/test-evolve-public-content-divergent-corner-cases.t Wed Apr 08 01:16:53 2020 +0800
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t Wed Apr 08 01:16:54 2020 +0800
@@ -419,8 +419,8 @@
$ hg evolve --continue
evolving 4:e568fd1029bb "added c e"
file 'd' was deleted in other but was modified in local.
- You can use (c)hanged version, (d)elete, or leave (u)nresolved.
- What do you want to do? u
+ What do you want to do?
+ use (c)hanged version, (d)elete, or leave (u)nresolved? u
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
unresolved merge conflicts
(see 'hg help evolve.interrupted')