From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Sep 2017 05:47:54 +0000 (+0900)
Subject: Merge branch 'ik/userdiff-html-h-element-fix'
X-Git-Tag: v2.15.0-rc0~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=376a1da8391ee44da5cb1bffabc47c5569208ec4;p=thirdparty%2Fgit.git

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

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

376a1da8391ee44da5cb1bffabc47c5569208ec4