Junio C Hamano 6c95f535e9 Merge branch 'da/mergetools-p4' into maint ... "git mergetool" feeds /dev/null as a common ancestor when dealing with an add/add conflict, but p4merge backend cannot handle it. Work it around by passing a temporary empty file. * da/mergetools-p4: mergetools/p4merge: Handle "/dev/null"		2012-11-18 19:31:40 -08:00
..
araxis
bc3
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
diffuse
ecmerge
emerge
kdiff3
kompare
meld
opendiff
p4merge	mergetools/p4merge: Handle "/dev/null"	2012-10-11 11:50:00 -07:00
tkdiff
tortoisemerge
vim
xxdiff