Merge tag 'v2.9.5' into maint-2.10

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

can_merge () {
        return 1
}

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