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
branchmercurial-4.2
changeset 3001 67b59d1657cf
parent 2798 2280461343e5
parent 3000 bd7e8be29542
child 3108 9c9c8c1eeb93 
--- a/tests/test-sharing.t	Tue Jul 25 15:17:17 2017 +0200
+++ b/tests/test-sharing.t	Wed Sep 27 01:07:22 2017 +0200
@@ -507,7 +507,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