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-first-changeset.t
branchstable
changeset 5084 946ebd8f08ea
parent 4984 b779b40f996e
child 5091 308c1e09f80f
child 5111 1fe3f7ffb462 
--- a/tests/test-evolve-content-divergent-first-changeset.t	Thu Jan 23 11:01:46 2020 +0100
+++ b/tests/test-evolve-content-divergent-first-changeset.t	Thu Jan 23 18:19:36 2020 +0700
@@ -31,7 +31,7 @@
   4b2524b7508e
   79fa0eb22d65
 
-  $ hg evolve --content-divergent --config ui.merge=internal:other
+  $ hg evolve --content-divergent --tool :other
   merge:[1] div1
   with: [2] div2
   base: [0] test
evolve