diff -r 0c286d054bcd -r 4b934144ed11 hgext3rd/evolve/compat.py
--- a/hgext3rd/evolve/compat.py	Thu Aug 24 10:48:38 2017 -0700
+++ b/hgext3rd/evolve/compat.py	Thu Aug 24 10:57:32 2017 -0700
@@ -110,13 +110,13 @@
     TROUBLES['CONTENTDIVERGENT'] = 'divergent'
     context.basectx.contentdivergent = context.basectx.divergent
 else:
-    TROUBLES['CONTENTDIVERGENT'] = 'contentdivergent'
+    TROUBLES['CONTENTDIVERGENT'] = 'content-divergent'
 
 if not util.safehasattr(context.basectx, 'phasedivergent'):
     TROUBLES['PHASEDIVERGENT'] = 'bumped'
     context.basectx.phasedivergent = context.basectx.bumped
 else:
-    TROUBLES['PHASEDIVERGENT'] = 'phasedivergent'
+    TROUBLES['PHASEDIVERGENT'] = 'phase-divergent'
 
 if not util.safehasattr(context.basectx, 'isunstable'):
     context.basectx.isunstable = context.basectx.troubled