mirror of
https://github.com/git/git.git
synced 2024-11-01 06:47:52 +01:00
26 lines
401 B
Text
26 lines
401 B
Text
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
touch "$BACKUP"
|
||
|
|
if $base_present
|
||
|
|
then
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
|
||
|
|
-mergeoutput="$MERGED"
|
||
|
|
else
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
||
|
|
-mergeoutput="$MERGED"
|
||
|
|
fi
|
||
|
|
check_unchanged
|
||
|
|
}
|
||
|
|
|
||
|
|
translate_merge_tool_path() {
|
||
|
|
if type bcomp >/dev/null 2>/dev/null
|
||
|
|
then
|
||
|
|
echo bcomp
|
||
|
|
else
|
||
|
|
echo bcompare
|
||
|
|
fi
|
||
|
|
}
|