mirror of
https://github.com/git/git.git
synced 2024-10-02 13:31:22 +02:00
26 lines
387 B
Plaintext
26 lines
387 B
Plaintext
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
touch "$BACKUP"
|
||
|
|
if $base_present
|
||
|
|
then
|
||
|
|
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
|
||
|
|
-RF="$MERGED"
|
||
|
|
else
|
||
|
|
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
|
||
|
|
-RF="$MERGED"
|
||
|
|
fi
|
||
|
|
check_unchanged
|
||
|
|
}
|
||
|
|
|
||
|
|
translate_merge_tool_path() {
|
||
|
|
if merge_mode
|
||
|
|
then
|
||
|
|
echo CodeMerge
|
||
|
|
else
|
||
|
|
echo CodeCompare
|
||
|
|
fi
|
||
|
|
}
|