Merge branch 'tl/userdiff-csharp-async'
commite215e89791b97ebb6831504480c8ab4734a2117e
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:00:47 +0000 (15 15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:00:47 +0000 (15 15:00 -0700)
treef6da72fc048c72f3458350f8faa8fbfa1339ff77
parent9ecfd98a87cce0ad345c2dedf14f892d12c49abb
parenta12cec99f8b64a0b99ae6f8a7e4724039406aea3
Merge branch 'tl/userdiff-csharp-async'

Update funcname pattern used for C# to recognize "async" keyword.

* tl/userdiff-csharp-async:
  userdiff.c: add C# async keyword in diff pattern
userdiff.c