From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Oct 2017 05:19:02 +0000 (+0900)
Subject: Merge branch 'ik/userdiff-html-h-element-fix' into maint
X-Git-Tag: v2.15.0-rc2~5^2~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8a4e894d42dd3b1c5dfa90e68ffaee5ab27dcc2;p=thirdparty%2Fgit.git

Merge branch 'ik/userdiff-html-h-element-fix' into maint

The built-in pattern to detect the "function header" for HTML did
not match <H1>..<H6> elements without any attributes, which has
been fixed.

* ik/userdiff-html-h-element-fix:
  userdiff: fix HTML hunk header regexp
---

b8a4e894d42dd3b1c5dfa90e68ffaee5ab27dcc2