git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e4ec408 6cf5f6c)
Merge branch 'da/mergetool-xxdiff-hotkey' into maint
authorJunio C Hamano <redacted>
Tue, 17 Jan 2017 23:11:05 +0000 (15:11 -0800)
committerJunio C Hamano <redacted>
Tue, 17 Jan 2017 23:11:05 +0000 (15:11 -0800)
commit6d1f93acfa79568ff60633ff09aa752f43cf8f5f
tree9a9ac6be36c6e8001a8f6457395195a0a7f261a4tree | snapshot
parente4ec4089883c9076744561863f9913bdefec06cfcommit | diff
parent6cf5f6cef7825ba73b3be0b2a2b381079d713bd1commit | diff
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
mergetools/xxdiff diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT