# HG changeset patch # User Boris Feld # Date 2017-06-30 01:39:44 # Node ID fcf6d1651ff32746ee02eff5685a43831d371ffe # Parent 270e344a6c7488080687b3f9c9ae718da06c71dc configitems: register the 'experimental.allowdivergence' config diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -155,6 +155,9 @@ coreconfigitem('email', 'from', coreconfigitem('email', 'method', default='smtp', ) +coreconfigitem('experimental', 'allowdivergence', + default=False, +) coreconfigitem('experimental', 'bundle-phases', default=False, )