From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Aug 2021 23:06:05 +0000 (-0700)
Subject: Merge branch 'th/userdiff-more-java'
X-Git-Tag: v2.34.0-rc0~229
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8960868518aaee85da308f394503dada14bfcbc;p=thirdparty%2Fgit.git

Merge branch 'th/userdiff-more-java'

The userdiff pattern for "java" language has been updated.

* th/userdiff-more-java:
  userdiff: improve java hunk header regex
---

a8960868518aaee85da308f394503dada14bfcbc