From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 May 2011 17:32:25 +0000 (-0700)
Subject: Merge branch 'jn/userdiff-perl-updates'
X-Git-Tag: v1.7.6-rc0~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7eacc2bc29cc810fd5722096aa3c2c9dc8db34ab;p=git.git

Merge branch 'jn/userdiff-perl-updates'

* jn/userdiff-perl-updates:
  userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters
  tests: make test_expect_code quieter on success
  userdiff/perl: catch sub with brace on second line
  userdiff/perl: match full line of POD headers
  userdiff/perl: anchor "sub" and "package" patterns on the left
  t4018 (funcname patterns): minor cleanups
  t4018 (funcname patterns): make configuration easier to track
  t4018 (funcname patterns): make .gitattributes state easier to track
---

7eacc2bc29cc810fd5722096aa3c2c9dc8db34ab