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
Junio C Hamano committed
Jan 3, 2013 at 10:29 UTC
894610af58244e46d1479acfa527483f30e896ec
No changes.