{"thread":{"id":"44668","subject":"[PATCH] mergetools: fix xxdiff hotkeys","startedAt":"2016-12-10T02:14:32Z","lastAt":"2016-12-10T02:14:32Z","messageCount":1,"participants":["David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"307412","messageId":"20161210021421.22955-1-davvid@gmail.com","threadId":"44668","inReplyTo":null,"subject":"[PATCH] mergetools: fix xxdiff hotkeys","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2016-12-10T02:14:21Z","receivedAt":"2016-12-10T02:14:32Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"xxdiff was using a mix of \"Ctrl-<key>\" and \"Ctrl+<key>\" hotkeys.\nThe dashed \"-\" form is not accepted by newer xxdiff versions.\nUse the plus \"+\" form only.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\nThis patch is based on top of da/mergetool-diff-order\n\n mergetools/xxdiff | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/mergetools/xxdiff b/mergetools/xxdiff\nindex e284811ff2..ce5b8e9f29 100644\n--- a/mergetools/xxdiff\n+++ b/mergetools/xxdiff\n@@ -1,7 +1,7 @@\n diff_cmd () {\n \t\"$merge_tool_path\" \\\n \t\t-R 'Accel.Search: \"Ctrl+F\"' \\\n-\t\t-R 'Accel.SearchForward: \"Ctrl-G\"' \\\n+\t\t-R 'Accel.SearchForward: \"Ctrl+G\"' \\\n \t\t\"$LOCAL\" \"$REMOTE\"\n }\n \n@@ -9,15 +9,15 @@ merge_cmd () {\n \tif $base_present\n \tthen\n \t\t\"$merge_tool_path\" -X --show-merged-pane \\\n-\t\t\t-R 'Accel.SaveAsMerged: \"Ctrl-S\"' \\\n+\t\t\t-R 'Accel.SaveAsMerged: \"Ctrl+S\"' \\\n \t\t\t-R 'Accel.Search: \"Ctrl+F\"' \\\n-\t\t\t-R 'Accel.SearchForward: \"Ctrl-G\"' \\\n+\t\t\t-R 'Accel.SearchForward: \"Ctrl+G\"' \\\n \t\t\t--merged-file \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"\n \telse\n \t\t\"$merge_tool_path\" -X $extra \\\n-\t\t\t-R 'Accel.SaveAsMerged: \"Ctrl-S\"' \\\n+\t\t\t-R 'Accel.SaveAsMerged: \"Ctrl+S\"' \\\n \t\t\t-R 'Accel.Search: \"Ctrl+F\"' \\\n-\t\t\t-R 'Accel.SearchForward: \"Ctrl-G\"' \\\n+\t\t\t-R 'Accel.SearchForward: \"Ctrl+G\"' \\\n \t\t\t--merged-file \"$MERGED\" \"$LOCAL\" \"$REMOTE\"\n \tfi\n }\n-- \n2.11.0.rc3.8.gaca8798.dirty\n\n"}]}