--- a/mercurial/context.py	Tue Aug 01 17:58:20 2017 +0200
+++ b/mercurial/context.py	Tue Aug 01 18:07:34 2017 +0200
@@ -230,14 +230,14 @@
 
         Troubles are returned as strings. possible values are:
         - orphan,
-        - bumped,
+        - phase-divergent,
         - content-divergent.
         """
         troubles = []
         if self.unstable():
             troubles.append('orphan')
         if self.bumped():
-            troubles.append('bumped')
+            troubles.append('phase-divergent')
         if self.divergent():
             troubles.append('content-divergent')
         return troubles