Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 34490:fcf6d1651ff3
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 |
comparison
equal
deleted
inserted
replaced
| 34489:270e344a6c74 | 34490:fcf6d1651ff3 |
|---|---|
| 153 default=None, | 153 default=None, |
| 154 ) | 154 ) |
| 155 coreconfigitem('email', 'method', | 155 coreconfigitem('email', 'method', |
| 156 default='smtp', | 156 default='smtp', |
| 157 ) | 157 ) |
| 158 coreconfigitem('experimental', 'allowdivergence', | |
| 159 default=False, | |
| 160 ) | |
| 158 coreconfigitem('experimental', 'bundle-phases', | 161 coreconfigitem('experimental', 'bundle-phases', |
| 159 default=False, | 162 default=False, |
| 160 ) | 163 ) |
| 161 coreconfigitem('experimental', 'bundle2-advertise', | 164 coreconfigitem('experimental', 'bundle2-advertise', |
| 162 default=True, | 165 default=True, |