Junio C Hamano a3c988727d Merge branch 'da/mergetool-xxdiff-hotkey' ... The way to specify hotkeys to "xxdiff" that is used by "git mergetool" has been modernized to match recent versions of xxdiff. * da/mergetool-xxdiff-hotkey: mergetools: fix xxdiff hotkeys		2016-12-19 14:45:41 -08:00
..
araxis
bc
bc3
codecompare
deltawalker
diffmerge
diffuse
ecmerge
emerge
examdiff
gvimdiff
gvimdiff2
gvimdiff3
kdiff3
kompare
meld
opendiff
p4merge
tkdiff
tortoisemerge
vimdiff	mergetools/vimdiff: trust Vim's exit code	2016-11-29 10:57:41 -08:00
vimdiff2
vimdiff3
winmerge
xxdiff	Merge branch 'da/mergetool-xxdiff-hotkey'	2016-12-19 14:45:41 -08:00