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>
David Aguilar committed
Dec 9, 2016 at 18:14 UTC
6cf5f6cef7825ba73b3be0b2a2b381079d713bd1
1 file changed
+5
-5
mergetools/xxdiff
+5
-5
@@ -1,7 +1,7 @@
1
diff_cmd () {
2
"$merge_tool_path" \
3
-R 'Accel.Search: "Ctrl+F"' \
4
- -R 'Accel.SearchForward: "Ctrl-G"' \
4
+ -R 'Accel.SearchForward: "Ctrl+G"' \
5
"$LOCAL" "$REMOTE"
6
}
7
@@ -10,15 +10,15 @@ merge_cmd () {
10
if $base_present
11
then
12
"$merge_tool_path" -X --show-merged-pane \
13
- -R 'Accel.SaveAsMerged: "Ctrl-S"' \
13
+ -R 'Accel.SaveAsMerged: "Ctrl+S"' \
14
-R 'Accel.Search: "Ctrl+F"' \
15
- -R 'Accel.SearchForward: "Ctrl-G"' \
15
+ -R 'Accel.SearchForward: "Ctrl+G"' \
16
--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
17
else
18
"$merge_tool_path" -X $extra \
19
- -R 'Accel.SaveAsMerged: "Ctrl-S"' \
19
+ -R 'Accel.SaveAsMerged: "Ctrl+S"' \
20
-R 'Accel.Search: "Ctrl+F"' \
21
- -R 'Accel.SearchForward: "Ctrl-G"' \
21
+ -R 'Accel.SearchForward: "Ctrl+G"' \
22
--merged-file "$MERGED" "$LOCAL" "$REMOTE"
23
fi
24
check_unchanged