Andrew's git / gitweb.git / diff
?
Merge branch 'da/p4merge-mktemp'
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Jan 2013 18:29:32 +0000 (10:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Jan 2013 18:29:32 +0000 (10:29 -0800)
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

Trivial merge