summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-22 14:15:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-22 14:15:20 -0700
commitdf7fd961a9d9ba60840ffc0868d36cc3db2aec74 (patch)
tree3f5090d591b2308f553a9ee3764eb004c2dd0218 /mergetools/tortoisemerge
parentNinth batch for 2.14 (diff)
parentconfigure.ac: loosen FREAD_READS_DIRECTORIES test program (diff)
downloadtgif-df7fd961a9d9ba60840ffc0868d36cc3db2aec74.tar.xz
Merge branch 'nd/fopen-errors'
Hotfix for a topic that is already in 'master'. * nd/fopen-errors: configure.ac: loosen FREAD_READS_DIRECTORIES test program
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions