Mercurial > public > mercurial-scm > hg
comparison mercurial/patch.py @ 36676:c6a61298ac32
mdiff: add a config option to use xdiff algorithm
The `experimental.xdiff` will affect the default diffopts and make mdiff use
the xdiff algorithm for better diff quality.
Differential Revision: https://phab.mercurial-scm.org/D2603
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Sat, 03 Mar 2018 12:39:14 -0800 |
| parents | 463df2986814 |
| children | 5bc7ff103081 |
comparison
equal
deleted
inserted
replaced
| 36675:430fdb717549 | 36676:c6a61298ac32 |
|---|---|
| 2254 'nodates': get('nodates'), | 2254 'nodates': get('nodates'), |
| 2255 'showfunc': get('show_function', 'showfunc'), | 2255 'showfunc': get('show_function', 'showfunc'), |
| 2256 'context': get('unified', getter=ui.config), | 2256 'context': get('unified', getter=ui.config), |
| 2257 } | 2257 } |
| 2258 buildopts['worddiff'] = ui.configbool('experimental', 'worddiff') | 2258 buildopts['worddiff'] = ui.configbool('experimental', 'worddiff') |
| 2259 buildopts['xdiff'] = ui.configbool('experimental', 'xdiff') | |
| 2259 | 2260 |
| 2260 if git: | 2261 if git: |
| 2261 buildopts['git'] = get('git') | 2262 buildopts['git'] = get('git') |
| 2262 | 2263 |
| 2263 # since this is in the experimental section, we need to call | 2264 # since this is in the experimental section, we need to call |