--- a/hgext3rd/evolve/__init__.py	Fri Aug 11 11:23:37 2017 +0200
+++ b/hgext3rd/evolve/__init__.py	Fri Aug 11 11:30:34 2017 +0200
@@ -1017,7 +1017,7 @@
 
     troubled = {
         "orphan": repo.revs("orphan()"),
-        "contentdivergent": repo.revs("divergent()"),
+        "contentdivergent": repo.revs("contentdivergent()"),
         "phasedivergent": repo.revs("bumped()"),
         "all": repo.revs("troubled()"),
     }

--- a/tests/test-obsolete.t	Fri Aug 11 11:23:37 2017 +0200
+++ b/tests/test-obsolete.t	Fri Aug 11 11:30:34 2017 +0200
@@ -681,7 +681,7 @@
   phases: 3 draft
   phase-divergent: 1 changesets
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
-  $ hg log -r 'divergent()'
+  $ hg log -r 'contentdivergent()'
   changeset:   12:6db5e282cb91
   parent:      10:2033b4e49474
   user:        test

--- a/tests/test-sharing.t	Fri Aug 11 11:23:37 2017 +0200
+++ b/tests/test-sharing.t	Fri Aug 11 11:30:34 2017 +0200
@@ -520,7 +520,7 @@
   base: [4] fix bug 24 (v1)
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   working directory is now at 5ad6037c046c
-  $ hg log -q -r 'divergent()'
+  $ hg log -q -r 'contentdivergent()'
 
 Figure SG10: Bob's repository after fixing divergence.
   $ hg --hidden shortlog -G -r 3::

--- a/tests/test-stabilize-result.t	Fri Aug 11 11:23:37 2017 +0200
+++ b/tests/test-stabilize-result.t	Fri Aug 11 11:30:34 2017 +0200
@@ -341,7 +341,7 @@
   2 new divergent changesets
 # reamend so that the case is not the first precursor.
   $ hg amend -m "More addition (2)"
-  $ hg phase 'divergent()'
+  $ hg phase 'contentdivergent()'
   21: draft
   24: draft
   $ hg evolve -qn --contentdivergent