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
branchmercurial-4.7
changeset 4783 5d50f3de4714
parent 4672 653c42af172e
parent 4778 1340d6718a88
child 4784 ecf0f3bc7468
child 5162 a7fb433faab6 
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Mon Jul 29 14:43:12 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Mon Jul 29 14:43:15 2019 +0200
@@ -416,8 +416,7 @@
 
   $ 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?
+  local changed d which other deleted
   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
evolve