1diff_cmd () {
2"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
3}
45
merge_cmd () {
6if $base_present
7then
8"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
9--default --mode=merge3 --to="$MERGED"
10else
11"$merge_tool_path" "$LOCAL" "$REMOTE" \
12--default --mode=merge2 --to="$MERGED"
13fi
14}