| commit | 6d1f93acfa79568ff60633ff09aa752f43cf8f5f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Jan 2017 23:11:05 +0000 (17 15:11 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Jan 2017 23:11:05 +0000 (17 15:11 -0800) | ||
| tree | 9a9ac6be36c6e8001a8f6457395195a0a7f261a4 | treesnapshot (tar.gz zip) |
| parent | e4ec4089883c9076744561863f9913bdefec06cf | commitdiff |
| parent | 6cf5f6cef7825ba73b3be0b2a2b381079d713bd1 | commitdiff |
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
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 | blobhistory |