Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'

[git] / mergetools / kompare

can_merge () {
        return 1
}

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