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)
commit065a652d6452c84efc8d1fbe8636ab8aeae5348e
treefa5509d373b4529a7e6fb7768cd3636482bbb5ca
parent951f92d2abb28f59e8207cce13aac3b15c95eeca
parent6d2f208c3dd39493f4d45ea67c55a1b7fe06626a
Merge branch 'bs/userdiff-php' into maint

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