diff -r 28fd13076962 -r 29f52e7966dd mercurial/configitems.py
--- a/mercurial/configitems.py	Tue Oct 17 15:57:56 2017 +0200
+++ b/mercurial/configitems.py	Tue Oct 17 16:54:31 2017 +0200
@@ -300,9 +300,6 @@
 coreconfigitem('email', 'reply-to',
     default=None,
 )
-coreconfigitem('experimental', 'allowdivergence',
-    default=False,
-)
 coreconfigitem('experimental', 'archivemetatemplate',
     default=dynamicdefault,
 )
@@ -348,6 +345,10 @@
 coreconfigitem('experimental', 'evolution',
     default=list,
 )
+coreconfigitem('experimental', 'evolution.allowdivergence',
+    default=False,
+    alias=[('experimental', 'allowdivergence')]
+)
 coreconfigitem('experimental', 'evolution.allowunstable',
     default=None,
 )