1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-29 21:37:53 +01:00
git/mergetools
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
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