Merge branch 'jk/maint-http-init-not-in-result-handler'

[git/mjg.git] / mergetools / kompare

can_merge () {
        return 1
}

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