--- a/mercurial/context.py	Thu Aug 03 00:45:02 2017 +0900
+++ b/mercurial/context.py	Tue Aug 01 17:58:20 2017 +0200
@@ -231,7 +231,7 @@
         Troubles are returned as strings. possible values are:
         - orphan,
         - bumped,
-        - divergent.
+        - content-divergent.
         """
         troubles = []
         if self.unstable():
@@ -239,7 +239,7 @@
         if self.bumped():
             troubles.append('bumped')
         if self.divergent():
-            troubles.append('divergent')
+            troubles.append('content-divergent')
         return troubles
 
     def parents(self):