Merge branch 'jv/userdiff-csharp-update' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 05:51:53 +0000 (14:51 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 05:51:53 +0000 (14:51 +0900)
commit91a14c6bad1d794fcb0f540d0564f6d32acf534e
tree817d24282150d928681b5570065c1806a7822856
parentee696f1e826c38c051adabe8cccfe2c3f3e78135
parentc4e317814f611d13d78981fc51bba1da8d1f0be6
Merge branch 'jv/userdiff-csharp-update' into jch

The userdiff pattern for C# learned the token "record".

* jv/userdiff-csharp-update:
  userdiff: add support for C# record types