tests/test-evolve-public-content-divergent-corner-cases.t
branchmercurial-5.0
changeset 4778 1340d6718a88
parent 4711 88c8ef4d703c
child 4783 5d50f3de4714
child 5159 e5fe3ca5e6ad
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Mon Jul 29 13:19:48 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Mon Jul 29 13:19:54 2019 +0200
@@ -417,8 +417,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')