From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Mar 2018 22:00:47 +0000 (-0700)
Subject: Merge branch 'tl/userdiff-csharp-async'
X-Git-Tag: v2.17.0-rc0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e215e89791b97ebb6831504480c8ab4734a2117e;p=thirdparty%2Fgit.git

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
---

e215e89791b97ebb6831504480c8ab4734a2117e