diff_cmd () { "$merge_tool_path" -c "$LOCAL" "$REMOTE" } merge_cmd () { if $base_present then "$merge_tool_path" -c \ -3 "$LOCAL" "$REMOTE" "$BASE" \ -m "$MERGED" else "$merge_tool_path" -c \ "$LOCAL" "$REMOTE" \ -m "$MERGED" fi } exit_code_trustable () { true }