Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maint

[git/jnareb-git.git] / mergetools / kompare

can_merge () {
        return 1
}

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