diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:54:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:54:58 -0700 |
| commit | 4d1f0ef2104dd0705cdde56979601bdd66f2c16f (patch) | |
| tree | 6fb082dbe68274523dcb01ed035fe69d1f3ab574 /xdiff/xmerge.c | |
| parent | Merge branch 'jk/maint-gitweb-test-use-sane-perl' (diff) | |
| parent | xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE (diff) | |
| download | tgif-4d1f0ef2104dd0705cdde56979601bdd66f2c16f.tar.xz | |
Merge branch 'tr/xdiff-fast-hash'
Use word-at-a-time comparison to find end of line or NUL (end of buffer),
borrowed from the linux-kernel discussion.
By Thomas Rast
* tr/xdiff-fast-hash:
xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE
xdiff: load full words in the inner loop of xdl_hash_record
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions