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 /merge-recursive.h | |
| parent | Merge branch 'ms/subtree-fixlets' (diff) | |
| parent | mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder (diff) | |
| download | tgif-894610af58244e46d1479acfa527483f30e896ec.tar.xz | |
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 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions