Merge branch 'kn/userdiff-php'

The userdiff pattern for .php has been updated. * kn/userdiff-php: userdiff: support new keywords in PHP hunk header t4018: add missing test cases for PHP

Junio C Hamano committed Jul 24, 2018 at 14:50 UTC d3f09389731e186a978f095228431b1bb293b6f6

No changes.