tests/test-evolve-content-divergent-corner-cases.t
branchmercurial-5.0
changeset 5087 5d76b320420e
parent 4991 2928f35023a1
child 5090 2631e735ec16
child 5159 e5fe3ca5e6ad
--- a/tests/test-evolve-content-divergent-corner-cases.t	Thu Jan 23 17:40:51 2020 +0700
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Thu Jan 23 17:40:52 2020 +0700
@@ -279,8 +279,8 @@
   rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be
   rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be
   file 'd' was deleted in local but was modified in other.
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? c
+  What do you want to do?
+  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   working directory is now at eb6357cd41b6