Merge branch 'master' of git://github.com/peff/git

[git/mingw.git] / mergetools / kompare

can_merge () {
        return 1
}

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