diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:35 -0800 |
| commit | 731490bf06792a4c96b61965cba2a0e430118e78 (patch) | |
| tree | d6121f7527b315fcb565c23f9d400161c050d645 /merge-recursive.c | |
| parent | 06cd5a1e01328724b7709ac232e36263e59f5f26 (diff) | |
| parent | 1f7c9261320576fcaaa5b4e50ad73336b17183e8 (diff) | |
| download | git-731490bf06792a4c96b61965cba2a0e430118e78.tar.gz git-731490bf06792a4c96b61965cba2a0e430118e78.tar.xz | |
Merge branch 'jk/xdiff-drop-xdl-fast-hash'
Retire the "fast hash" that had disastrous performance issues in
some corner cases.
* jk/xdiff-drop-xdl-fast-hash:
xdiff: drop XDL_FAST_HASH
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions