diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:46 -0700 |
| commit | d3f09389731e186a978f095228431b1bb293b6f6 (patch) | |
| tree | 48c7f4f04a502fdafdd2d19238132e186d6e40d2 /builtin/fmt-merge-msg.c | |
| parent | Merge branch 'jk/fetch-all-peeled-fix' (diff) | |
| parent | userdiff: support new keywords in PHP hunk header (diff) | |
| download | tgif-d3f09389731e186a978f095228431b1bb293b6f6.tar.xz | |
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
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions