summaryrefslogtreecommitdiff
path: root/mergetools/kdiff3
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-12-01 18:54:54 -0500
committerJeff King <peff@peff.net>2015-12-01 18:54:54 -0500
commit43ed3827ed5ce06692d02e0f0c6809ff5812bb6e (patch)
treefb46c9d00c38514e96ed83d38b52899a560eac00 /mergetools/kdiff3
parente2187fe520057ccf3021e642de3a770790e9baae (diff)
parentc55d65f3c524ab2cb40e2293343eb28a0ee0fe46 (diff)
downloadgit-43ed3827ed5ce06692d02e0f0c6809ff5812bb6e.tar.gz
Merge branch 'jk/send-email-ca-path'
Use a safer behavior when we hit errors verifying remote certificates. * jk/send-email-ca-path: send-email: die if CA path doesn't exist
Diffstat (limited to 'mergetools/kdiff3')
0 files changed, 0 insertions, 0 deletions