Mercurial > hg

diff mercurial/configitems.py @ 34490:fcf6d1651ff3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the 'experimental.allowdivergence' config
author Boris Feld <boris.feld@octobus.net>
date Fri, 30 Jun 2017 03:39:44 +0200
parents cbda631c1dde
children eb1517776f8a
line wrap: on
line diff
--- 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,
 )