Mercurial > hg
comparison mercurial/configitems.py @ 34479:99c3dee3f6ce
configitems: register the 'merge.preferancestor' config
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Fri, 30 Jun 2017 03:43:13 +0200 |
parents | ef303daefdf7 |
children | cbda631c1dde |
comparison
equal
deleted
inserted
replaced
34478:ef303daefdf7 | 34479:99c3dee3f6ce |
---|---|
300 default=None, | 300 default=None, |
301 ) | 301 ) |
302 coreconfigitem('merge', 'followcopies', | 302 coreconfigitem('merge', 'followcopies', |
303 default=True, | 303 default=True, |
304 ) | 304 ) |
305 coreconfigitem('merge', 'preferancestor', | |
306 default=lambda: ['*'], | |
307 ) | |
305 coreconfigitem('pager', 'ignore', | 308 coreconfigitem('pager', 'ignore', |
306 default=list, | 309 default=list, |
307 ) | 310 ) |
308 coreconfigitem('patch', 'eol', | 311 coreconfigitem('patch', 'eol', |
309 default='strict', | 312 default='strict', |