Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

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

can_merge () {
        return 1
}

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