…
..
araxis
bc
bc3
codecompare
deltawalker
diffmerge
diffuse
ecmerge
emerge
examdiff
guiffy
gvimdiff
gvimdiff2
gvimdiff3	mergetools: add vimdiff3 mode	2014-04-22 12:49:07 -07:00
kdiff3
kompare	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
meld
opendiff
p4merge
smerge
tkdiff
tortoisemerge
vimdiff	mergetools/vimdiff: trust Vim's exit code	2016-11-29 10:57:41 -08:00
vimdiff2
vimdiff3
winmerge
xxdiff