git-commit-vandalism/mergetools
..
araxis
bc
bc3 mergetool: rename bc3 to bc 2014-10-21 11:25:30 -07:00
codecompare
deltawalker
diffmerge
diffuse
ecmerge
emerge
examdiff
guiffy
gvimdiff
gvimdiff2
gvimdiff3
kdiff3
kompare
meld
opendiff
p4merge
smerge
tkdiff
tortoisemerge
vimdiff
vimdiff2
vimdiff3
winmerge
xxdiff