summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-10 12:32:18 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-10 12:32:18 -0800
commit740b6ad75bbe0cd0c3f4be30f0380814878ac445 (patch)
tree8f0e6726178c2d6ffc9cbadc204a034b892fb464 /Documentation/merge-options.txt
parent7b2ac7ee9ec19b8f9302a776b7274faee66e9b64 (diff)
parent1e380ddcd29f1e25bfb58b7068fdafb038c8dd9a (diff)
downloadgit-740b6ad75bbe0cd0c3f4be30f0380814878ac445.tar.gz
Merge branch 'vl/maint-openssl-signature-change'
* vl/maint-openssl-signature-change: imap-send.c: fix compiler warnings for OpenSSL 1.0
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions