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# Enable commit diffs for binary PHP test files. Some PHP test files include 17# special characters, such as ASCII control characters. Git recognizes these as 18# binary and wouldn't generate diffs. 19*.phpt diff 20
