aboutsummaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2016-12-09 18:14:21 -0800
committerJunio C Hamano <gitster@pobox.com>2016-12-11 16:20:32 -0800
commit6cf5f6cef7825ba73b3be0b2a2b381079d713bd1 (patch)
tree94b8a2e2265462fc8b97aaec17ccfb64a0ef1b6f /commit.c
parent654311bf6ee0fbf530c088271c2c76d46f31f82d (diff)
downloadgit-6cf5f6cef7825ba73b3be0b2a2b381079d713bd1.tar.gz
git-6cf5f6cef7825ba73b3be0b2a2b381079d713bd1.tar.xz
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions