| commit | 894610af58244e46d1479acfa527483f30e896ec | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Jan 2013 18:29:32 +0000 (3 10:29 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Jan 2013 18:29:32 +0000 (3 10:29 -0800) | ||
| tree | 849f724b4dfc454da2122326b7f01c7951397c8b | treesnapshot (tar.gz zip) |
| parent | b81827b6b642da698e5d32fb54d74687dcf223cc | commitdiff |
| parent | 950b5680bdacd3eaa4a528f4dc2d5652f1beb88d | commitdiff |
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
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