Merge branch 'tl/userdiff-csharp-async'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:00:47 +0000 (15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:00:47 +0000 (15:00 -0700)
Update funcname pattern used for C# to recognize "async" keyword.

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

1  2 
userdiff.c

diff --cc userdiff.c
Simple merge