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)
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


Trivial merge