diff options
| author |  David Aguilar <davvid@gmail.com> | 2012-12-26 16:45:29 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-12-26 18:13:15 -0800 |
| commit | 950b5680bdacd3eaa4a528f4dc2d5652f1beb88d (patch) | |
| tree | 2654842e7328bfa17c47fecf0e99c95e9665233d /Documentation/diff-config.txt | |
| parent | Remove duplicate entry in ./Documentation/Makefile (diff) | |
| download | tgif-950b5680bdacd3eaa4a528f4dc2d5652f1beb88d.tar.xz | |
mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
Use $TMPDIR when creating the /dev/null placeholder for p4merge.
This prevents users from finding a seemingly random untracked file
in their worktree.
This is different than what mergetool does with $LOCAL and
$REMOTE because those files exist to aid users when resolving
merges. p4merge's /dev/null placeholder is not helpful in that
situation so it is sensible to keep it out of the worktree.
Reported-by: Jeremy Morton <admin@game-point.net>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-config.txt')
0 files changed, 0 insertions, 0 deletions