Merge commit 'refs/top-bases/t/misc/blob_plain-charset' into t/misc/blob_plain-charset

[git/gitweb.git] / mergetools / kompare

can_merge () {
        return 1
}

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