summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-07 09:06:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-07 09:06:39 -0700
commitecde699a475d4c357dbeb37d3e8ca0d5d3de91bb (patch)
treeead31a98a81efb61e31ac437187302714084e241 /mergetools/p4merge
parentMerge git://github.com/git-l10n/git-po (diff)
parentAdd persistent-https to contrib (diff)
downloadtgif-ecde699a475d4c357dbeb37d3e8ca0d5d3de91bb.tar.xz
Merge branch 'cr/persistent-https'
A remote helper that acts as a proxy and caches ssl session for the https:// transport is added to the contrib/ area. By Colby Ranger * cr/persistent-https: Add persistent-https to contrib
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions