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 /mergetools | |
| parent | b07c4e9b2478c6500ed227da970356ef68286240 (diff) | |
| parent | 6cf5f6cef7825ba73b3be0b2a2b381079d713bd1 (diff) | |
| download | git-a3c988727de3bc659b0a3833c5d40d2a5c610fd5.tar.gz git-a3c988727de3bc659b0a3833c5d40d2a5c610fd5.tar.xz | |
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 'mergetools')
| -rw-r--r-- | mergetools/xxdiff | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mergetools/xxdiff b/mergetools/xxdiff index e284811ff..ce5b8e9f2 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" } @@ -9,15 +9,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 } |