Junio C Hamano bdf26fcbea Merge branch 'jn/ancient-meld-support' into maint ... * jn/ancient-meld-support: mergetools/meld: Use --help output to detect --output support		2012-02-27 15:33:07 -08:00
..
araxis
bc3	mergetools: use the correct tool for Beyond Compare 3 on Windows	2011-10-15 20:13:55 -07:00
defaults	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
diffuse	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
ecmerge
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
meld	mergetools/meld: Use --help output to detect --output support	2012-02-10 14:53:18 -08:00
opendiff
p4merge
tkdiff	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
tortoisemerge
vim	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
xxdiff