mercurial/ui.py
changeset 2892 8b02af865990
parent 2873 4ec58b157265
child 2920 ef8ee4477019
equal deleted inserted replaced
2891:453097750fbf 2892:8b02af865990
   172     def diffopts(self, opts={}):
   172     def diffopts(self, opts={}):
   173         return mdiff.diffopts(
   173         return mdiff.diffopts(
   174             text=opts.get('text'),
   174             text=opts.get('text'),
   175             showfunc=(opts.get('show_function') or
   175             showfunc=(opts.get('show_function') or
   176                       self.configbool('diff', 'showfunc', None)),
   176                       self.configbool('diff', 'showfunc', None)),
       
   177             git=(opts.get('git') or
       
   178                  self.configbool('diff', 'git', None)),
   177             ignorews=(opts.get('ignore_all_space') or
   179             ignorews=(opts.get('ignore_all_space') or
   178                       self.configbool('diff', 'ignorews', None)),
   180                       self.configbool('diff', 'ignorews', None)),
   179             ignorewsamount=(opts.get('ignore_space_change') or
   181             ignorewsamount=(opts.get('ignore_space_change') or
   180                             self.configbool('diff', 'ignorewsamount', None)),
   182                             self.configbool('diff', 'ignorewsamount', None)),
   181             ignoreblanklines=(opts.get('ignore_blank_lines') or
   183             ignoreblanklines=(opts.get('ignore_blank_lines') or