mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
7f59fccd52
An always enabled lexbor extension is added, containing the lexbor library that was separated from ext/dom extension in preparation of https://wiki.php.net/rfc/url_parsing_api. While at it, the lexbor library is upgraded to 2.5.0. Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Co-authored-by: Gina Peter Banyard <girgias@php.net>
34 lines
1.1 KiB
Plaintext
34 lines
1.1 KiB
Plaintext
# Replace $Id$ strings with 40-character hexadecimal blob object name.
|
|
/ext/ext_skel.php ident
|
|
/ext/phar/phar/pharcommand.inc ident
|
|
/ext/dba/libinifile/inifile.c ident
|
|
/ext/dba/libflatfile/flatfile.c ident
|
|
/ext/dba/libcdb/cdb_make.c ident
|
|
/ext/dba/libcdb/cdb.c ident
|
|
/run-tests.php ident
|
|
|
|
# A custom merge driver to avoid automatic merges. These are manually merged.
|
|
# See https://wiki.php.net/vcs/gitfaq
|
|
/NEWS merge=NEWS
|
|
/UPGRADING merge=NEWS
|
|
/UPGRADING.INTERNALS merge=NEWS
|
|
|
|
# Configure proper diff drivers to improve the context lines in the output
|
|
# of git diff and to improve token splitting for --word-diff.
|
|
*.phpt diff=php
|
|
*.php diff=php
|
|
*.[ch] diff=cpp
|
|
|
|
# Collapse generated files within git and pull request diff.
|
|
**/*_arginfo.h linguist-generated -diff
|
|
/main/debug_gdb_scripts.c linguist-generated -diff
|
|
/Zend/zend_vm_execute.h linguist-generated -diff
|
|
/Zend/zend_vm_handlers.h linguist-generated -diff
|
|
/Zend/zend_vm_opcodes.[ch] linguist-generated -diff
|
|
|
|
# The OSS fuzz files are binary
|
|
/ext/date/tests/ossfuzz*.txt binary
|
|
|
|
# Vendored libraries
|
|
/ext/lexbor/lexbor linguist-vendored
|