mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-19 10:36:09 +02:00
Code

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>
This commit is contained in:
David Aguilar 2016-12-09 18:14:21 -08:00 committed by Junio C Hamano
parent 654311bf6e
commit 6cf5f6cef7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mergetools/xxdiff
View File

@ -1,7 +1,7 @@
diff_cmd () { diff_cmd () {
"$merge_tool_path" \ "$merge_tool_path" \
-R 'Accel.Search: "Ctrl+F"' \ -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 if $base_present
then then
"$merge_tool_path" -X --show-merged-pane \ "$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" --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
else else
"$merge_tool_path" -X $extra \ "$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" --merged-file "$MERGED" "$LOCAL" "$REMOTE"
fi fi
check_unchanged check_unchanged