diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-03 10:29:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-03 10:29:32 -0800 |
| commit | 894610af58244e46d1479acfa527483f30e896ec (patch) | |
| tree | 849f724b4dfc454da2122326b7f01c7951397c8b /gitweb/static/js | |
| parent | b81827b6b642da698e5d32fb54d74687dcf223cc (diff) | |
| parent | 950b5680bdacd3eaa4a528f4dc2d5652f1beb88d (diff) | |
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
Diffstat (limited to 'gitweb/static/js')
0 files changed, 0 insertions, 0 deletions