Merge branch 'kn/userdiff-php'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:46 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:46 +0000 (14:50 -0700)
commitd3f09389731e186a978f095228431b1bb293b6f6
tree48c7f4f04a502fdafdd2d19238132e186d6e40d2
parent49b46fde9f74b720fe3bc552caba55f6c1c3a0b1
parent1ab631647e3addd247c5482e8a3d4c9df7978c62
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