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-public-content-divergent-corner-cases.t
changeset 4711 88c8ef4d703c
parent 4676 b6c819facbe8
child 4778 1340d6718a88
child 5079 1f92a6aa40d6
child 5240 6f5e6253324f 
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Tue Jul 09 17:08:34 2019 +0800
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Jul 11 10:07:39 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.
-  What do you want to do?
-  use (c)hanged version, (d)elete, or leave (u)nresolved? u
+  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+  What do you want to do? u
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
evolve