From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2018 21:50:46 +0000 (-0700)
Subject: Merge branch 'kn/userdiff-php'
X-Git-Tag: v2.19.0-rc0~134
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d3f09389731e186a978f095228431b1bb293b6f6?hp=d3f09389731e186a978f095228431b1bb293b6f6

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