From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Mar 2022 21:09:29 +0000 (-0700)
Subject: Merge branch 'jd/userdiff-kotlin'
X-Git-Tag: v2.36.0-rc0~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ece3cb865d55a506bd7b927d7dd824c77972029;p=thirdparty%2Fgit.git

Merge branch 'jd/userdiff-kotlin'

A new built-in userdiff driver for kotlin.

* jd/userdiff-kotlin:
  userdiff: add builtin diff driver for kotlin language.
---

3ece3cb865d55a506bd7b927d7dd824c77972029