From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jun 2010 12:40:48 +0000 (-0700)
Subject: Merge branch 'bs/userdiff-php' into maint
X-Git-Tag: v1.7.2-rc0~38^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/065a652d6452c84efc8d1fbe8636ab8aeae5348e?hp=-c

Merge branch 'bs/userdiff-php' into maint

* bs/userdiff-php:
diff: Support visibility modifiers in the PHP hunk header regexp
---

065a652d6452c84efc8d1fbe8636ab8aeae5348e