David Aguilar 950b5680bd 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>		2012-12-26 18:13:15 -08:00
..
araxis
bc3	mergetools: use the correct tool for Beyond Compare 3 on Windows	2011-10-15 20:13:55 -07:00
codecompare	Add Code Compare v2.80.4 as a merge / diff tool for Windows	2012-08-10 08:08:08 -07:00
defaults	mergetool--lib: Allow custom commands to override built-ins	2012-09-25 09:04:39 -07:00
deltawalker	mergetools: add a plug-in to support DeltaWalker	2012-03-05 09:31:47 -08:00
diffuse
ecmerge
emerge
kdiff3
kompare
meld	mergetools/meld: Use --help output to detect --output support	2012-02-10 14:53:18 -08:00
opendiff
p4merge	mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder	2012-12-26 18:13:15 -08:00
tkdiff
tortoisemerge
vim
xxdiff