summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-24 13:24:49 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-24 13:24:49 -0800
commitc6caede7fd6bc428b4d2e53f6bb5c1e1a9bcb24c (patch)
tree47c0591c521e0d369b0d284298104c8d8377c954 /t/t7800-difftool.sh
parent89ba4e7c7f71712133d1d3137f811b99ea43dd31 (diff)
parent16529f2e5630d3d155e4dff0ebd3c7c5daa882f9 (diff)
downloadgit-c6caede7fd6bc428b4d2e53f6bb5c1e1a9bcb24c.tar.gz
Merge branch 'maint'
* maint: imap-send: link against libcrypto for HMAC and others git-send-email.perl: Deduplicate "to:" and "cc:" entries with names mingw: do not set errno to 0 on success
Diffstat (limited to 't/t7800-difftool.sh')
0 files changed, 0 insertions, 0 deletions