diff options
| author | David Aguilar <davvid@gmail.com> | 2016-12-10 02:14:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-12 00:20:32 (GMT) |
| commit | 6cf5f6cef7825ba73b3be0b2a2b381079d713bd1 (patch) | |
| tree | 94b8a2e2265462fc8b97aaec17ccfb64a0ef1b6f | |
| parent | 654311bf6ee0fbf530c088271c2c76d46f31f82d (diff) | |
| download | git-6cf5f6cef7825ba73b3be0b2a2b381079d713bd1.zip git-6cf5f6cef7825ba73b3be0b2a2b381079d713bd1.tar.gz git-6cf5f6cef7825ba73b3be0b2a2b381079d713bd1.tar.bz2 | |
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>
| -rw-r--r-- | mergetools/xxdiff | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mergetools/xxdiff b/mergetools/xxdiff index 05b4433..cc3b2f0 100644 --- a/mergetools/xxdiff +++ b/mergetools/xxdiff @@ -1,7 +1,7 @@ diff_cmd () { "$merge_tool_path" \ -R 'Accel.Search: "Ctrl+F"' \ - -R 'Accel.SearchForward: "Ctrl-G"' \ + -R 'Accel.SearchForward: "Ctrl+G"' \ "$LOCAL" "$REMOTE" } @@ -10,15 +10,15 @@ merge_cmd () { if $base_present then "$merge_tool_path" -X --show-merged-pane \ - -R 'Accel.SaveAsMerged: "Ctrl-S"' \ + -R 'Accel.SaveAsMerged: "Ctrl+S"' \ -R 'Accel.Search: "Ctrl+F"' \ - -R 'Accel.SearchForward: "Ctrl-G"' \ + -R 'Accel.SearchForward: "Ctrl+G"' \ --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" -X $extra \ - -R 'Accel.SaveAsMerged: "Ctrl-S"' \ + -R 'Accel.SaveAsMerged: "Ctrl+S"' \ -R 'Accel.Search: "Ctrl+F"' \ - -R 'Accel.SearchForward: "Ctrl-G"' \ + -R 'Accel.SearchForward: "Ctrl+G"' \ --merged-file "$MERGED" "$LOCAL" "$REMOTE" fi check_unchanged |