Merge commit 'refs/top-bases/t/girocco/style-updates' into t/girocco/style-updates

[git/gitweb.git] / mergetools / kompare

can_merge () {
        return 1
}

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