1diff_cmd () {
2"$merge_tool_path" "$LOCAL" "$REMOTE"
3}
45
merge_cmd () {
6if $base_present
7then
8"$merge_tool_path" -s "$LOCAL" \
9"$REMOTE" "$BASE" "$MERGED"
10else
11"$merge_tool_path" -m "$LOCAL" \
12"$REMOTE" "$MERGED"
13fi
14}
1516
exit_code_trustable () {
17true
18}