1diff_cmd () {
2"$merge_tool_path" "$LOCAL" "$REMOTE"
3}
45
merge_cmd () {
6if $base_present
7then
8"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
9else
10"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
11fi
12}
1314
exit_code_trustable () {
15true
16}