diff tests/test-divergent.t @ 3154:406992d0d611

evolve: rename --contentdivergent flag to --content-divergent

This makes the whole things easier to read.

--- a/tests/test-divergent.t	Thu Oct 26 08:44:50 2017 +0200
+++ b/tests/test-divergent.t	Thu Oct 26 09:02:25 2017 +0200
@@ -53,7 +53,7 @@
   |/
   o  0:135f39f4bd78@default(draft) add _a []
   
-  $ hg evolve --all --any --contentdivergent
+  $ hg evolve --all --any --content-divergent
   merge:[2] add bdivergent1
   with: [3] add bdivergent2
   base: [1] add _b
@@ -98,7 +98,7 @@
   |/
   o  0:135f39f4bd78@default(draft) add _a []
   
-  $ hg evolve --all --any --contentdivergent
+  $ hg evolve --all --any --content-divergent
   merge:[6] add cdivergent1
   with: [7] cdivergent2
   base: [5] add _c
@@ -146,9 +146,9 @@
   > EOF
   $ hg evolve --all
   nothing to evolve on current working copy parent
-  (do you want to use --contentdivergent)
+  (do you want to use --content-divergent)
   [2]
-  $ hg evolve --contentdivergent
+  $ hg evolve --content-divergent
   merge:[3] add bdivergent2
   with: [2] add bdivergent1
   base: [1] add _b