mirror of
https://github.com/git/git.git
synced 2024-06-10 13:26:12 +02:00
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:
parent
654311bf6e
commit
6cf5f6cef7
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue