Merge branch 'na/no-http-test-in-the-middle' into maint

[git/mjg.git] / mergetools / kompare

can_merge () {
        return 1
}

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