Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-content-divergent-corner-cases.t
branchmercurial-5.0
changeset 5159 e5fe3ca5e6ad
parent 5087 5d76b320420e
parent 5079 1f92a6aa40d6
child 5162 a7fb433faab6
child 5364 be5aa681c122 
--- a/tests/test-evolve-content-divergent-corner-cases.t	Fri Feb 28 23:10:48 2020 +0700
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Fri Feb 28 23:18:48 2020 +0700
@@ -281,8 +281,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
evolve