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 5162 a7fb433faab6
parent 4783 5d50f3de4714
parent 5159 e5fe3ca5e6ad
child 5163 1752a2e7a226
child 5367 cb5983c0287f 
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Sat Feb 29 15:17:13 2020 +0700
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Sat Feb 29 15:17:31 2020 +0700
@@ -418,8 +418,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