diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-10-27 15:09:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-27 15:09:46 -0700 |
| commit | a8a49ebf61449f80d8c5ea2f9768f0ca590e51dd (patch) | |
| tree | 7e2d330cdb4f7784076ed0e950d85b6b15b9cf47 /ll-merge.c | |
| parent | other small fixes for 2.29.2 (diff) | |
| parent | userdiff: PHP: catch "abstract" and "final" functions (diff) | |
| download | tgif-a8a49ebf61449f80d8c5ea2f9768f0ca590e51dd.tar.xz | |
Merge branch 'js/userdiff-php'
Userdiff for PHP update.
* js/userdiff-php:
userdiff: PHP: catch "abstract" and "final" functions
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions