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	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
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	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
ecmerge	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
emerge	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
kdiff3	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
kompare	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
meld	mergetools/meld: Use --help output to detect --output support	2012-02-10 14:53:18 -08:00
opendiff	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
p4merge	mergetools/p4merge: Handle "/dev/null"	2012-10-11 11:50:00 -07:00
tkdiff	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
tortoisemerge	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
vim	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
xxdiff	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00