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)
* bs/userdiff-php:
  diff: Support visibility modifiers in the PHP hunk header regexp

1  2 
userdiff.c

diff --cc userdiff.c
Simple merge