Mercurial > evolve

diff tests/test-evolve-content-divergent-corner-cases.t @ 5314:e6e92835d42d mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 20:36:29 +0800
parents e5fe3ca5e6ad e8660b28bfee
children 011b53a9d03c eed42a183d46
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-corner-cases.t	Fri May 08 20:36:28 2020 +0800
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Fri May 08 20:36:29 2020 +0800
@@ -353,8 +353,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 51ee71efed61