Merge branch 'gp/describe-match-uses-glob-pattern' into maint-1.8.1

[git.git] / mergetools / kompare

can_merge () {
        return 1
}

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