diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-17 17:36:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-17 17:36:06 -0700 |
| commit | ca01600306863ecfa8bbef769b8e1386cb149785 (patch) | |
| tree | 30507da396d4a19240aed15c47a2f4356dd3987d /Documentation/git-mergetool.txt | |
| parent | Merge branch 'jc/maint-smart-http-race-upload-pack' (diff) | |
| parent | xdiff/xhistogram: drop need for additional variable (diff) | |
| download | tgif-ca01600306863ecfa8bbef769b8e1386cb149785.tar.xz | |
Merge branch 'rc/histogram-diff'
* rc/histogram-diff:
xdiff/xhistogram: drop need for additional variable
xdiff/xhistogram: rely on xdl_trim_ends()
xdiff/xhistogram: rework handling of recursed results
xdiff: do away with xdl_mmfile_next()
Make test number unique
xdiff/xprepare: use a smaller sample size for histogram diff
xdiff/xprepare: skip classification
teach --histogram to diff
t4033-diff-patience: factor out tests
xdiff/xpatience: factor out fall-back-diff function
xdiff/xprepare: refactor abort cleanups
xdiff/xprepare: use memset()
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions