Merge branch 'ik/userdiff-html-h-element-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:02 +0000 (14:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:02 +0000 (14:19 +0900)
commitb8a4e894d42dd3b1c5dfa90e68ffaee5ab27dcc2
tree5735b27bfa71a50b3dbb95f66bcd000e5fda0f2a
parent16ba0f44c0cac7c06cf7ce37498b8c83e0f3b69b
parent9c03caca2c40870cf7f879d18e55db1c94877cd5
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
userdiff.c