Merge branch 'da/mergetool-xxdiff-hotkey' into maint

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

diff --cc mergetools/xxdiff
index e284811ff28563458e76b3f03f95bf9eb11fa726,cc3b2f0e3164c7d49af852153599ae6b133387f1..ce5b8e9f296233470d18feae929772235e4f12f2
--- 1/mergetools/xxdiff
--- 2/mergetools/xxdiff
+++ b/mergetools/xxdiff
@@@ -15,9 -16,10 +15,9 @@@ merge_cmd () 
                        --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
  }