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

1  2 
userdiff.c

diff --cc userdiff.c
Simple merge