Merge branch 'jn/add-2.0-u-A-sans-pathspec'

[git] / mergetools / tkdiff

diff_cmd () {
        "$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
        if $base_present
        then
                "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
        else
                "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
        fi
}