Junio C Hamano 6d1f93acfa Merge branch 'da/mergetool-xxdiff-hotkey' into maint ...

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

2017-01-17 15:11:05 -08:00

..

araxis

…

bc

…

bc3

…

codecompare

…

deltawalker

…

diffmerge

…

diffuse

…

ecmerge

…

emerge

…

examdiff

…

gvimdiff

…

gvimdiff2

…

gvimdiff3

…

kdiff3

…

kompare

…

meld

…

opendiff

…

p4merge

…

tkdiff

…

tortoisemerge

…

vimdiff

…

vimdiff2

…

vimdiff3

…

winmerge

…

xxdiff

…