From: Junio C Hamano 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: https://git.lorimer.id.au/gitweb.git/diff_plain/e215e89791b97ebb6831504480c8ab4734a2117e?hp=--cc 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