Mercurial > public > mercurial-scm > hg
comparison mercurial/configitems.py @ 34522:bed1d2eaa108
configitems: register 'merge.checkunknown' and 'merge.checkignored'
They both use the same function defining a default, so we need to update them at
the same time.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Sun, 08 Oct 2017 21:48:40 +0200 |
| parents | aacb17cc0ee4 |
| children | 486dbd6afa57 |
comparison
equal
deleted
inserted
replaced
| 34521:aacb17cc0ee4 | 34522:bed1d2eaa108 |
|---|---|
| 342 default=None, | 342 default=None, |
| 343 ) | 343 ) |
| 344 coreconfigitem('http_proxy', 'user', | 344 coreconfigitem('http_proxy', 'user', |
| 345 default=None, | 345 default=None, |
| 346 ) | 346 ) |
| 347 coreconfigitem('merge', 'checkunknown', | |
| 348 default='abort', | |
| 349 ) | |
| 350 coreconfigitem('merge', 'checkignored', | |
| 351 default='abort', | |
| 352 ) | |
| 347 coreconfigitem('merge', 'followcopies', | 353 coreconfigitem('merge', 'followcopies', |
| 348 default=True, | 354 default=True, |
| 349 ) | 355 ) |
| 350 coreconfigitem('merge', 'preferancestor', | 356 coreconfigitem('merge', 'preferancestor', |
| 351 default=lambda: ['*'], | 357 default=lambda: ['*'], |