| commit | a3c988727de3bc659b0a3833c5d40d2a5c610fd5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Dec 2016 22:45:41 +0000 (19 14:45 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Dec 2016 22:45:41 +0000 (19 14:45 -0800) | ||
| tree | c93209b47b08ced4ae111f97ab8f63defff15c8d | treesnapshot (tar.gz zip) |
| parent | b07c4e9b2478c6500ed227da970356ef68286240 | commitdiff |
| parent | 6cf5f6cef7825ba73b3be0b2a2b381079d713bd1 | commitdiff |
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
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 |