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-meta.t
changeset 4633 61c2518cd6d2
parent 4625 a4fde4e3e763
child 4635 ea9ae2d2095a 
--- a/tests/test-evolve-content-divergent-meta.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-meta.t	Fri Apr 26 01:20:08 2019 +0530
@@ -86,8 +86,6 @@
   merge:[3] added c e
   with: [4] added c
   base: [2] added c
-  updating to "local" side of the conflict: 0c9267e23c9d
-  merging "other" content-divergent changeset '6c06cda6dc99'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Make sure resultant cset don't replace the initial user with user running the command:
evolve