Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fix

[alt-git.git] / mergetools / kompare

can_merge () {
        return 1
}

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