1diff_cmd () { 2 "$merge_tool_path" "$LOCAL" "$REMOTE" 3} 4 5merge_cmd () { 6 if $base_present 7 then 8 "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE" 9 else 10 "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE" 11 fi 12}
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
else
"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
fi