--- a/hgext3rd/evolve/compat.py	Thu Aug 24 09:11:54 2017 +0200
+++ b/hgext3rd/evolve/compat.py	Thu Aug 24 09:12:09 2017 +0200
@@ -107,7 +107,10 @@
     TROUBLES['ORPHAN'] = 'orphan'
 
 if not util.safehasattr(context.basectx, 'contentdivergent'):
+    TROUBLES['CONTENTDIVERGENT'] = 'divergent'
     context.basectx.contentdivergent = context.basectx.divergent
+else:
+    TROUBLES['CONTENTDIVERGENT'] = 'contentdivergent'
 
 if not util.safehasattr(context.basectx, 'phasedivergent'):
     TROUBLES['PHASEDIVERGENT'] = 'bumped'