diff options
| author |  Tay Ray Chuan <rctay89@gmail.com> | 2011-07-12 14:10:25 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-07-12 09:29:20 -0700 |
| commit | 8c912eea94a2138e8bc608f7c390eb0b313effb0 (patch) | |
| tree | 244d67eaac3f77d6645bdf69b87e23a90dbb2485 /contrib/examples/git-merge.sh | |
| parent | t4033-diff-patience: factor out tests (diff) | |
| download | tgif-8c912eea94a2138e8bc608f7c390eb0b313effb0.tar.xz | |
teach --histogram to diff
Port JGit's HistogramDiff algorithm over to C. Rough numbers (TODO) show
that it is faster than its --patience cousin, as well as the default
Meyers algorithm.
The implementation has been reworked to use structs and pointers,
instead of bitmasks, thus doing away with JGit's 2^28 line limit.
We also use xdiff's default hash table implementation (xdl_hash_bits()
with XDL_HASHLONG()) for convenience.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions