Merge branch 'bs/userdiff-php' into next
commitf1bc101d5b54a28058b2a99ace9289796ed776c6
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Jun 2010 22:18:10 +0000 (3 15:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Jun 2010 22:18:10 +0000 (3 15:18 -0700)
tree77459bc2341ed4f666d89bc994c41b203ceb878c
parent6ec4dfc5c6915ef9c3a0278b77a35ed6c62434fa
parent6d2f208c3dd39493f4d45ea67c55a1b7fe06626a
Merge branch 'bs/userdiff-php' into next

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