Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint

[git.git] / mergetools / kompare

can_merge () {
        return 1
}

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