Merge branch 'bs/userdiff-php'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:22:05 +0000 (11:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:22:05 +0000 (11:22 -0700)
commit9559910cac77526a95dd5dca93a2e3e6d290c5b9
treecc54ed8304998eecc379db3764e0cb6de1931eff
parente391fdfc69bd64e11f31416c38ab491a04c0ffa0
parent6d2f208c3dd39493f4d45ea67c55a1b7fe06626a
Merge branch 'bs/userdiff-php'

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