--- a/tests/test-stabilize-result.t	Thu Oct 26 08:44:50 2017 +0200
+++ b/tests/test-stabilize-result.t	Thu Oct 26 09:02:25 2017 +0200
@@ -244,14 +244,14 @@
 
 Stabilize it
 
-  $ hg evolve -qn --confirm --contentdivergent
+  $ hg evolve -qn --confirm --content-divergent
   merge:[14] More addition
   with: [13] More addition
   base: [12] More addition
   perform evolve? [Ny] n
   abort: evolve aborted by user
   [255]
-  $ echo y | hg evolve -qn --confirm --config ui.interactive=True --contentdivergent
+  $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent
   merge:[14] More addition
   with: [13] More addition
   base: [12] More addition
@@ -262,7 +262,7 @@
   hg up -C 3932c176bbaa &&
   hg revert --all --rev tip &&
   hg commit -m "`hg log -r eacc9c8240fe --template={desc}`";
-  $ hg evolve -v --contentdivergent
+  $ hg evolve -v --content-divergent
   merge:[14] More addition
   with: [13] More addition
   base: [12] More addition
@@ -336,14 +336,14 @@
   $ hg phase 'contentdivergent()'
   15: draft
   17: draft
-  $ hg evolve -qn --contentdivergent
+  $ hg evolve -qn --content-divergent
   hg update -c 0b336205a5d0 &&
   hg merge f344982e63c4 &&
   hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&&
   hg up -C 3932c176bbaa &&
   hg revert --all --rev tip &&
   hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`";
-  $ hg evolve --contentdivergent
+  $ hg evolve --content-divergent
   merge:[17] More addition (2)
   with: [15] More addition
   base: [12] More addition