mirror of
https://github.com/git/git.git
synced 2024-11-06 09:13:01 +01:00
a3c988727d
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
23 lines
584 B
Text
23 lines
584 B
Text
diff_cmd () {
|
|
"$merge_tool_path" \
|
|
-R 'Accel.Search: "Ctrl+F"' \
|
|
-R 'Accel.SearchForward: "Ctrl+G"' \
|
|
"$LOCAL" "$REMOTE"
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" -X --show-merged-pane \
|
|
-R 'Accel.SaveAsMerged: "Ctrl+S"' \
|
|
-R 'Accel.Search: "Ctrl+F"' \
|
|
-R 'Accel.SearchForward: "Ctrl+G"' \
|
|
--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
|
|
else
|
|
"$merge_tool_path" -X $extra \
|
|
-R 'Accel.SaveAsMerged: "Ctrl+S"' \
|
|
-R 'Accel.Search: "Ctrl+F"' \
|
|
-R 'Accel.SearchForward: "Ctrl+G"' \
|
|
--merged-file "$MERGED" "$LOCAL" "$REMOTE"
|
|
fi
|
|
}
|