Merge branch 'jn/perl-funcname' into next
commit20542eda5bf24be5a3db8372259239c34e147bb8
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:25:05 +0000 (5 14:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:25:05 +0000 (5 14:25 -0800)
tree47395808098a7c065430130392ebbc13edd0d025
parentad5234d06aeb060814f93afaf76449f023fc23ee
parenta25e47377d6a1ec1efc6972f2e5e55cf429603a1
Merge branch 'jn/perl-funcname' into next

* jn/perl-funcname:
  userdiff/perl: catch BEGIN/END/... and POD as headers
  diff: funcname and word patterns for perl
Documentation/gitattributes.txt