| commit | a8e00d7b83e0c810a16cb441b9d0601be7706f2c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Feb 2013 16:03:20 +0000 (25 08:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Feb 2013 16:03:20 +0000 (25 08:03 -0800) | ||
| tree | 0c79db017155493e67f0938fd66db89ecc2df920 | treesnapshot (tar.gz zip) |
| parent | 4f021b34f2d5b775690f63796a2973753660c8a8 | commitdiff |
| parent | 950b5680bdacd3eaa4a528f4dc2d5652f1beb88d | commitdiff |
Merge branch 'da/p4merge-mktemp' into maint
* da/p4merge-mktemp:
mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
* da/p4merge-mktemp:
mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder