diff_cmd () { | |
"$merge_tool_path" "$LOCAL" "$REMOTE" | |
} | |
merge_cmd () { | |
if $base_present | |
then | |
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \ | |
-mergeoutput="$MERGED" | |
else | |
"$merge_tool_path" "$LOCAL" "$REMOTE" \ | |
-mergeoutput="$MERGED" | |
fi | |
} | |
translate_merge_tool_path() { | |
if type bcomp >/dev/null 2>/dev/null | |
then | |
echo bcomp | |
else | |
echo bcompare | |
fi | |
} |