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-sharing.t
branchstable
changeset 3000 bd7e8be29542
parent 2929 06844693bb21
child 3001 67b59d1657cf
child 3013 945a0989e41b 
--- a/tests/test-sharing.t	Mon Aug 21 14:21:49 2017 +0200
+++ b/tests/test-sharing.t	Wed Sep 27 00:54:28 2017 +0200
@@ -514,7 +514,7 @@
   7:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
 
 Use evolve to fix the divergence.
-  $ HGMERGE=internal:other hg evolve --divergent
+  $ HGMERGE=internal:other hg evolve --contentdivergent
   merge:[6] fix bug 24 (v2 by bob)
   with: [7] fix bug 24 (v2 by alice)
   base: [4] fix bug 24 (v1)
evolve