| commit | 6cf5f6cef7825ba73b3be0b2a2b381079d713bd1 | |
| author | David Aguilar <davvid@gmail.com> | |
| Sat, 10 Dec 2016 02:14:21 +0000 (9 18:14 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Dec 2016 00:20:32 +0000 (11 16:20 -0800) | ||
| tree | 94b8a2e2265462fc8b97aaec17ccfb64a0ef1b6f | treesnapshot (tar.gz zip) |
| parent | 654311bf6ee0fbf530c088271c2c76d46f31f82d | commitdiff |
mergetools: fix xxdiff hotkeys
xxdiff was using a mix of "Ctrl-<key>" and "Ctrl+<key>" hotkeys.
The dashed "-" form is not accepted by newer xxdiff versions.
Use the plus "+" form only.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
xxdiff was using a mix of "Ctrl-<key>" and "Ctrl+<key>" hotkeys.
The dashed "-" form is not accepted by newer xxdiff versions.
Use the plus "+" form only.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| mergetools/xxdiff | diffblobblamehistory |