Merge branch 'as/tree-walk-fix-aggressive-short-cut'

[git] / mergetools / diffmerge

diff_cmd () {
        "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
        if $base_present
        then
                "$merge_tool_path" --merge --result="$MERGED" \
                        "$LOCAL" "$BASE" "$REMOTE"
        else
                "$merge_tool_path" --merge \
                        --result="$MERGED" "$LOCAL" "$REMOTE"
        fi
        status=$?
}