You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
618 B
26 lines
618 B
13 years ago
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" \
|
||
|
|
-R 'Accel.Search: "Ctrl+F"' \
|
||
|
|
-R 'Accel.SearchForward: "Ctrl-G"' \
|
||
|
|
"$LOCAL" "$REMOTE"
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
touch "$BACKUP"
|
||
|
|
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
|
||
|
|
check_unchanged
|
||
|
|
}
|