mirror of
https://github.com/git/git.git
synced 2024-11-15 13:43:45 +01:00
16 lines
286 B
Text
16 lines
286 B
Text
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
if $base_present
|
||
|
|
then
|
||
|
|
"$merge_tool_path" --merge --result="$MERGED" \
|
||
|
|
"$LOCAL" "$BASE" "$REMOTE"
|
||
|
|
else
|
||
|
|
"$merge_tool_path" --merge \
|
||
|
|
--result="$MERGED" "$LOCAL" "$REMOTE"
|
||
|
|
fi
|
||
|
|
status=$?
|
||
|
|
}
|