Merge branch 'da/p4merge-mktemp' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:03:20 +0000 (08:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:03:20 +0000 (08:03 -0800)
commita8e00d7b83e0c810a16cb441b9d0601be7706f2c
tree0c79db017155493e67f0938fd66db89ecc2df920
parent4f021b34f2d5b775690f63796a2973753660c8a8
parent950b5680bdacd3eaa4a528f4dc2d5652f1beb88d
Merge branch 'da/p4merge-mktemp' into maint

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