diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:27 -0700 |
| commit | 6dbe1b4ee21bb52b2069fc0330915483ec020386 (patch) | |
| tree | 4562d5185d7092271803eb56f7850ccd05fac724 /builtin/merge.c | |
| parent | Merge branch 'tk/fast-export-anonymized-tag-fix' (diff) | |
| parent | userdiff: support enum keyword in PHP hunk header (diff) | |
| download | tgif-6dbe1b4ee21bb52b2069fc0330915483ec020386.tar.xz | |
Merge branch 'uk/userdiff-php-enum'
Update the userdiff pattern for PHP.
* uk/userdiff-php-enum:
userdiff: support enum keyword in PHP hunk header
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions