]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jd/userdiff-kotlin'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Mar 2022 21:09:29 +0000 (14:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Mar 2022 21:09:29 +0000 (14:09 -0700)
A new built-in userdiff driver for kotlin.

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

1  2 
userdiff.c

diff --cc userdiff.c
Simple merge