diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:41 -0800 |
| commit | a3c988727de3bc659b0a3833c5d40d2a5c610fd5 (patch) | |
| tree | c93209b47b08ced4ae111f97ab8f63defff15c8d /builtin/am.c | |
| parent | b07c4e9b2478c6500ed227da970356ef68286240 (diff) | |
| parent | 6cf5f6cef7825ba73b3be0b2a2b381079d713bd1 (diff) | |
| download | git-a3c988727de3bc659b0a3833c5d40d2a5c610fd5.tar.gz | |
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
Diffstat (limited to 'builtin/am.c')
0 files changed, 0 insertions, 0 deletions