diff -r c3953ae44b87 -r f42a87cc864d tests/test-sharing.t
--- a/tests/test-sharing.t	Mon Oct 23 16:04:23 2017 +0200
+++ b/tests/test-sharing.t	Wed Nov 01 23:51:55 2017 +0100
@@ -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)