Merge branch 'ik/userdiff-html-h-element-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Sep 2017 05:47:54 +0000 (14:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Sep 2017 05:47:54 +0000 (14:47 +0900)
commit376a1da8391ee44da5cb1bffabc47c5569208ec4
tree3d17fdea7823f32eff14cf7d5f242238237ed683
parent59373a4e03e273841c6c3b7fc9ac29c0a3e90c6d
parent9c03caca2c40870cf7f879d18e55db1c94877cd5
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
userdiff.c