Merge branch 'tl/userdiff-csharp-async' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Mar 2018 21:13:39 +0000 (13:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Mar 2018 21:13:39 +0000 (13:13 -0800)
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