mercurial/configitems.py
changeset 45518 32ce4cbaec4b
parent 45483 d252f51ab032
child 45579 b9d6ab6cdeb4
equal deleted inserted replaced
45517:2a68a5ec8dd0 45518:32ce4cbaec4b
   633     b'experimental', b'httppeer.v2-encoder-order', default=None,
   633     b'experimental', b'httppeer.v2-encoder-order', default=None,
   634 )
   634 )
   635 coreconfigitem(
   635 coreconfigitem(
   636     b'experimental', b'httppostargs', default=False,
   636     b'experimental', b'httppostargs', default=False,
   637 )
   637 )
   638 coreconfigitem(
       
   639     b'experimental', b'mergedriver', default=None,
       
   640 )
       
   641 coreconfigitem(b'experimental', b'nointerrupt', default=False)
   638 coreconfigitem(b'experimental', b'nointerrupt', default=False)
   642 coreconfigitem(b'experimental', b'nointerrupt-interactiveonly', default=True)
   639 coreconfigitem(b'experimental', b'nointerrupt-interactiveonly', default=True)
   643 
   640 
   644 coreconfigitem(
   641 coreconfigitem(
   645     b'experimental', b'obsmarkers-exchange-debug', default=False,
   642     b'experimental', b'obsmarkers-exchange-debug', default=False,