summaryrefslogtreecommitdiff
path: root/t/t5536-fetch-conflicts.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-01-07 12:58:05 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-07 12:58:05 -0800
commitc5cb52fd7cfc4ecf43afda721d0a3700274a8361 (patch)
treec360983aec636a38d45ee489b085b5a3902667ef /t/t5536-fetch-conflicts.sh
parentMerge branch 'br/imap-send-verbosity' (diff)
parentgit-imap-send: use libcurl for implementation (diff)
downloadtgif-c5cb52fd7cfc4ecf43afda721d0a3700274a8361.tar.xz
Merge branch 'br/imap-send-via-libcurl'
Newer libCurl knows how to talk IMAP; "git imap-send" has been updated to use this instead of a hand-rolled OpenSSL calls. * br/imap-send-via-libcurl: git-imap-send: use libcurl for implementation
Diffstat (limited to 't/t5536-fetch-conflicts.sh')
0 files changed, 0 insertions, 0 deletions