David Aguilar 3facc60031 mergetools/p4merge: Handle "/dev/null" ... p4merge does not properly handle the case where "/dev/null" is passed as a filename. Work it around by creating a temporary file for this purpose. 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> --- Needs to be amended with Tested-by when a report comes...		2012-10-11 11:50:00 -07:00
..
araxis
bc3	mergetools: use the correct tool for Beyond Compare 3 on Windows	2011-10-15 20:13:55 -07:00
defaults
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: Handle "/dev/null"	2012-10-11 11:50:00 -07:00
tkdiff
tortoisemerge
vim
xxdiff