1# Replace $Id$ strings with 40-character hexadecimal blob object name. 2/ext/ext_skel.php ident 3/ext/phar/phar/pharcommand.inc ident 4/ext/dba/libinifile/inifile.c ident 5/ext/dba/libflatfile/flatfile.c ident 6/ext/dba/libcdb/cdb_make.c ident 7/ext/dba/libcdb/cdb.c ident 8/run-tests.php ident 9 10# A custom merge driver to avoid automatic merges. These are manually merged. 11# See https://wiki.php.net/vcs/gitfaq 12/NEWS merge=NEWS 13/UPGRADING merge=NEWS 14/UPGRADING.INTERNALS merge=NEWS 15 16# Configure proper diff drivers to improve the context lines in the output 17# of git diff and to improve token splitting for --word-diff. 18*.phpt diff=php 19*.php diff=php 20*.[ch] diff=cpp 21 22# Collapse generated files within a pull request. 23**/*_arginfo.h linguist-generated 24/Zend/zend_vm_execute.h linguist-generated 25/Zend/zend_vm_opcodes.{h,c} linguist-generated 26 27# The OSS fuzz files are bunary 28/ext/date/tests/ossfuzz*.txt binary 29