summaryrefslogtreecommitdiff
path: root/mergetools/examdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-17 13:50:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-17 13:50:27 -0700
commit81944e9b54039f8475d1df5c40e5a1055eae14f6 (patch)
tree7380115d867612f500f48bc89e6ccc9046e809a3 /mergetools/examdiff
parentMerge branch 'mg/status-porcelain-no-i18n' (diff)
parenthash.h: move SHA-1 implementation selection into a header file (diff)
downloadtgif-81944e9b54039f8475d1df5c40e5a1055eae14f6.tar.xz
Merge branch 'bc/sha1-header-selection-with-cpp-macros'
Our source code has used the SHA1_HEADER cpp macro after "#include" in the C code to switch among the SHA-1 implementations. Instead, list the exact header file names and switch among implementations using "#ifdef BLK_SHA1/#include "block-sha1/sha1.h"/.../#endif"; this helps some IDE tools. * bc/sha1-header-selection-with-cpp-macros: hash.h: move SHA-1 implementation selection into a header file
Diffstat (limited to 'mergetools/examdiff')
0 files changed, 0 insertions, 0 deletions