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.3
changeset 3166 e1a230cc4527
parent 3106 a867d59ea97a
parent 3154 406992d0d611
child 3167 f089741039e5
child 3418 85cdce113c2c 
--- a/tests/test-sharing.t	Mon Oct 23 15:50:18 2017 +0200
+++ b/tests/test-sharing.t	Wed Nov 01 23:57:56 2017 +0100
@@ -514,7 +514,7 @@
   7:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
 
 Use evolve to fix the divergence.
-  $ HGMERGE=internal:other hg evolve --contentdivergent
+  $ HGMERGE=internal:other hg evolve --content-divergent
   merge:[6] fix bug 24 (v2 by bob)
   with: [7] fix bug 24 (v2 by alice)
   base: [4] fix bug 24 (v1)
evolve