summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-03 10:29:32 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-03 10:29:32 -0800
commit894610af58244e46d1479acfa527483f30e896ec (patch)
tree849f724b4dfc454da2122326b7f01c7951397c8b /setup.c
parentMerge branch 'ms/subtree-fixlets' (diff)
parentmergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder (diff)
downloadtgif-894610af58244e46d1479acfa527483f30e896ec.tar.xz
Merge branch 'da/p4merge-mktemp'
Create an empty file in $TMPDIR instead of using an empty file in the local directory. * da/p4merge-mktemp: mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
Diffstat (limited to 'setup.c')
0 files changed, 0 insertions, 0 deletions