Merge branch 'ss/userdiff-update-csharp-java' into pu
commitd32506d40f11d537ebde8607fe05a7060ba7879b
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 21:09:06 +0000 (25 14:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 21:09:06 +0000 (25 14:09 -0700)
tree4136bfb702fc5b20bfb1be77fd21fd6030b893e3
parent5619ca6f5c4f23e3ae4624972c9163091a0ead4d
parentdfbefc803e8ec8768d170609bbbdaad9fd6cba7f
Merge branch 'ss/userdiff-update-csharp-java' into pu

Reviews sent; waiting for a response.

* ss/userdiff-update-csharp-java:
  userdiff: support Java try keyword
  userdiff: support C# async methods and correct C# keywords