Merge branch 'da/mergetool-xxdiff-hotkey' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2016 00:09:40 +0000 (16:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2016 00:09:40 +0000 (16:09 -0800)
commita08f375c813b28fd6c72b6095638a1e4f7af8780
tree91532484bb5c7b4485b67bea19ec57031680866b
parenta951db78bccef3b89fb226473df75c4c2443f082
parent6cf5f6cef7825ba73b3be0b2a2b381079d713bd1
Merge branch 'da/mergetool-xxdiff-hotkey' into next

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
mergetools/xxdiff