git-commit-vandalism/mergetools
..
araxis
bc3
codecompare
deltawalker
diffmerge
diffuse
ecmerge
emerge
gvimdiff
gvimdiff2
kdiff3
kompare
meld
opendiff
p4merge
tkdiff
tortoisemerge
vimdiff
vimdiff2
xxdiff