From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Feb 2013 16:03:20 +0000 (-0800)
Subject: Merge branch 'da/p4merge-mktemp' into maint
X-Git-Tag: v1.8.2-rc1~2^2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a8e00d7b83e0c810a16cb441b9d0601be7706f2c?hp=--cc

Merge branch 'da/p4merge-mktemp' into maint

* da/p4merge-mktemp:
mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
---

a8e00d7b83e0c810a16cb441b9d0601be7706f2c