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: http://git.ipfire.org/?a=commitdiff_plain;h=d3f09389731e186a978f095228431b1bb293b6f6;p=thirdparty%2Fgit.git

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

d3f09389731e186a978f095228431b1bb293b6f6