Junio C Hamano 746b6fb968 Merge branch 'jn/ancient-meld-support' ...

* jn/ancient-meld-support:
  mergetools/meld: Use --help output to detect --output support

2012-02-14 12:57:17 -08:00

..

araxis

…

bc3

mergetools: use the correct tool for Beyond Compare 3 on Windows

2011-10-15 20:13:55 -07:00

defaults

…

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

…

tkdiff

…

tortoisemerge

…

vim

…

xxdiff

…