Merge branch 'mm/add-p-split-error'

[git/mingw/j6t.git] / mergetools / kompare

can_merge () {
        return 1
}

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