From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Jan 2013 18:29:32 +0000 (-0800)
Subject: Merge branch 'da/p4merge-mktemp'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=894610af58244e46d1479acfa527483f30e896ec;p=git.git

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
---

894610af58244e46d1479acfa527483f30e896ec