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>

diff --git a/mergetools/xxdiff b/mergetools/xxdiff
index 05b443394ba166a82a22abfcf27865b4627405e2..cc3b2f0e3164c7d49af852153599ae6b133387f1 100644 (file)
--- a/mergetools/xxdiff
+++ b/mergetools/xxdiff
@@ -1,7 +1,7 @@
 diff_cmd () {
        "$merge_tool_path" \
                -R 'Accel.Search: "Ctrl+F"' \
 diff_cmd () {
        "$merge_tool_path" \
                -R 'Accel.Search: "Ctrl+F"' \

-               -R 'Accel.SearchForward: "Ctrl-G"' \
+               -R 'Accel.SearchForward: "Ctrl+G"' \

                "$LOCAL" "$REMOTE"
 }
 
                "$LOCAL" "$REMOTE"
 }
 


@@ -10,15 +10,15 @@ merge_cmd () {
        if $base_present
        then
                "$merge_tool_path" -X --show-merged-pane \
        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.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 \
                        --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.Search: "Ctrl+F"' \

-                       -R 'Accel.SearchForward: "Ctrl-G"' \
+                       -R 'Accel.SearchForward: "Ctrl+G"' \

                        --merged-file "$MERGED" "$LOCAL" "$REMOTE"
        fi
        check_unchanged
                        --merged-file "$MERGED" "$LOCAL" "$REMOTE"
        fi
        check_unchanged