mirror of
https://github.com/php/php-src.git
synced 2024-09-23 10:57:26 +00:00
ca797ca31e
As described in https://wiki.php.net/vcs/gitworkflow#the_news_file it is possible to setup a custom merge driver for NEWS so git doesnt try to merge it. This commit sets the default merge driver for the NEWS file to the merge driver called NEWS.
25 lines
917 B
Plaintext
25 lines
917 B
Plaintext
ext/mysqlnd/mysqlnd.h ident
|
|
ext/simplexml/simplexml.c ident
|
|
ext/iconv/php_iconv.h ident
|
|
ext/posix/posix.c ident
|
|
ext/recode/recode.c ident
|
|
ext/skeleton/create_stubs ident
|
|
ext/phar/phar/pharcommand.inc ident
|
|
ext/phar/phar.c ident
|
|
ext/sysvmsg/sysvmsg.c ident
|
|
ext/enchant/enchant.c ident
|
|
ext/reflection/php_reflection.c ident
|
|
ext/oci8/oci8.c 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
|
|
ext/filter/filter.c ident
|
|
README.input_filter ident
|
|
run-tests.php ident
|
|
sapi/nsapi/nsapi.c ident
|
|
sapi/continuity/capi.c ident
|
|
Zend/RFCs/002.txt ident
|
|
Zend/RFCs/003.txt ident
|
|
NEWS merge=NEWS
|