[PATCH] mergetools: fix xxdiff hotkeys
From: David Aguilar <hidden>
Date: 2016-12-10 02:14:32
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- This patch is based on top of da/mergetool-diff-order mergetools/xxdiff | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/mergetools/xxdiff b/mergetools/xxdiff
index e284811ff2..ce5b8e9f29 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 }
--
2.11.0.rc3.8.gaca8798.dirty