Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 33235:b838e857439d
configitems: register the 'format.aggressivemergedeltas' config
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 30 Jun 2017 03:42:20 +0200 |
| parents | b62d13506860 |
| children | cf6c478bc339 |
comparison
equal
deleted
inserted
replaced
| 33234:b62d13506860 | 33235:b838e857439d |
|---|---|
| 102 default=False, | 102 default=False, |
| 103 ) | 103 ) |
| 104 coreconfigitem('devel', 'strip-obsmarkers', | 104 coreconfigitem('devel', 'strip-obsmarkers', |
| 105 default=True, | 105 default=True, |
| 106 ) | 106 ) |
| 107 coreconfigitem('format', 'aggressivemergedeltas', | |
| 108 default=False, | |
| 109 ) | |
| 107 coreconfigitem('hostsecurity', 'ciphers', | 110 coreconfigitem('hostsecurity', 'ciphers', |
| 108 default=None, | 111 default=None, |
| 109 ) | 112 ) |
| 110 coreconfigitem('hostsecurity', 'disabletls10warning', | 113 coreconfigitem('hostsecurity', 'disabletls10warning', |
| 111 default=False, | 114 default=False, |