summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-01-07 13:08:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-07 13:08:30 -0800
commit74a101eb48b72fad372cfa15669a3b6c55fb1046 (patch)
tree1319ef4691b0e9096ccc3667ac74e03365118dce /Documentation/git-mergetool.txt
parentMerge branch 'sb/t5400-remove-unused' (diff)
parentgit-compat-util: suppress unavoidable Apple-specific deprecation warnings (diff)
downloadtgif-74a101eb48b72fad372cfa15669a3b6c55fb1046.tar.xz
Merge branch 'es/squelch-openssl-warnings-on-macosx'
Squelch useless compiler warnings on Mac OS X. * es/squelch-openssl-warnings-on-macosx: git-compat-util: suppress unavoidable Apple-specific deprecation warnings
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions