diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-17 17:17:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-17 17:17:16 -0700 |
| commit | b14b969ab98d5dac835e57a2b6b9e9229b2e1c97 (patch) | |
| tree | 98ae611f55619bcc45546ff33204900618abf10a /builtin/merge-file.c | |
| parent | xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records() (diff) | |
| parent | xdiff/xhistogram: drop need for additional variable (diff) | |
| download | tgif-b14b969ab98d5dac835e57a2b6b9e9229b2e1c97.tar.xz | |
Merge branch 'rc/histogram-diff' into HEAD
* 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()
Conflicts:
xdiff/xprepare.c
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions