git-commit-vandalism/mergetools
..
araxis
bc3
defaults
diffuse
ecmerge
emerge
kdiff3
kompare
meld
opendiff
p4merge
tkdiff
tortoisemerge
vim
xxdiff