1diff_cmd () {
2"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
3}
45
merge_cmd () {
6if $base_present
7then
8"$merge_tool_path" --merge --result="$MERGED" \
9"$LOCAL" "$BASE" "$REMOTE"
10else
11"$merge_tool_path" --merge \
12--result="$MERGED" "$LOCAL" "$REMOTE"
13fi
14}
1516
exit_code_trustable () {
17true
18}