tree f6da72fc048c72f3458350f8faa8fbfa1339ff77
parent 9ecfd98a87cce0ad345c2dedf14f892d12c49abb
parent a12cec99f8b64a0b99ae6f8a7e4724039406aea3
author Junio C Hamano <gitster@pobox.com> 1521151247 -0700
committer Junio C Hamano <gitster@pobox.com> 1521151247 -0700

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