mercurial/configitems.py
changeset 46496 d57e607d9e33
parent 46494 d67732a4b58a
child 46588 47557ea79fc7
equal deleted inserted replaced
46495:5aac1a1a5beb 46496:d57e607d9e33
   752     b'discovery.sample-size.initial',
   752     b'discovery.sample-size.initial',
   753     default=100,
   753     default=100,
   754 )
   754 )
   755 _registerdiffopts(section=b'diff')
   755 _registerdiffopts(section=b'diff')
   756 coreconfigitem(
   756 coreconfigitem(
       
   757     b'diff',
       
   758     b'merge',
       
   759     default=False,
       
   760     experimental=True,
       
   761 )
       
   762 coreconfigitem(
   757     b'email',
   763     b'email',
   758     b'bcc',
   764     b'bcc',
   759     default=None,
   765     default=None,
   760 )
   766 )
   761 coreconfigitem(
   767 coreconfigitem(