# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1498786784 -7200
# Node ID fcf6d1651ff32746ee02eff5685a43831d371ffe
# Parent  270e344a6c7488080687b3f9c9ae718da06c71dc
configitems: register the 'experimental.allowdivergence' config

diff -r 270e344a6c74 -r fcf6d1651ff3 mercurial/configitems.py
--- a/mercurial/configitems.py	Thu Oct 05 21:56:25 2017 +0000
+++ b/mercurial/configitems.py	Fri Jun 30 03:39:44 2017 +0200
@@ -155,6 +155,9 @@
 coreconfigitem('email', 'method',
     default='smtp',
 )
+coreconfigitem('experimental', 'allowdivergence',
+    default=False,
+)
 coreconfigitem('experimental', 'bundle-phases',
     default=False,
 )