mercurial/configitems.py
changeset 34480 99c3dee3f6ce
parent 34479 ef303daefdf7
child 34481 cbda631c1dde
equal deleted inserted replaced
34479:ef303daefdf7 34480: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',