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
changeset 3154 406992d0d611
parent 3075 8feb2cae7eae
child 3166 e1a230cc4527
child 3359 ae6fddf39933 
--- a/tests/test-sharing.t	Thu Oct 26 08:44:50 2017 +0200
+++ b/tests/test-sharing.t	Thu Oct 26 09:02:25 2017 +0200
@@ -505,7 +505,7 @@
   6: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:[5] fix bug 24 (v2 by bob)
   with: [6] fix bug 24 (v2 by alice)
   base: [4] fix bug 24 (v1)
evolve