summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-12-08 14:05:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-12-08 14:05:03 -0800
commitb5d2d8eef0ad08022a3f635c0bc292eb2cc5aefc (patch)
tree591e520fa223ef9294eb0fe50b7868023f3262a3 /mergetools/gvimdiff
parentMerge branch 'sg/bash-prompt-dirty-orphan' into maint (diff)
parentsha1: allow limiting the size of the data passed to SHA1_Update() (diff)
downloadtgif-b5d2d8eef0ad08022a3f635c0bc292eb2cc5aefc.tar.xz
Merge branch 'ad/sha1-update-chunked' into maint
Apple's common crypto implementation of SHA1_Update() does not take more than 4GB at a time, and we now have a compile-time workaround for it. * ad/sha1-update-chunked: sha1: allow limiting the size of the data passed to SHA1_Update() sha1: provide another level of indirection for the SHA-1 functions
Diffstat (limited to 'mergetools/gvimdiff')
0 files changed, 0 insertions, 0 deletions