Code

Merge branch 'bs/userdiff-php' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:40:48 +0000 (05:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:40:48 +0000 (05:40 -0700)
* bs/userdiff-php:
  diff: Support visibility modifiers in the PHP hunk header regexp


Trivial merge