Commit: 9a56dce83fc22331cde819e67516c7a1a95ce3be Author: Nikita Popov <ni...@php.net> Sat, 23 Mar 2013 18:26:11 +0100 Parents: bda5c0b082ad78e71eb6c80b4268443f939a9bed Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a56dce83fc22331cde819e67516c7a1a95ce3be Log: Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS Changed paths: M .gitattributes Diff: diff --git a/.gitattributes b/.gitattributes index 9ed6e5f..79b218f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,6 +23,8 @@ sapi/continuity/capi.c ident Zend/RFCs/002.txt ident Zend/RFCs/003.txt ident NEWS merge=NEWS +UPGRADING merge=NEWS +UPGRADING.INTERNALS merge=NEWS /ext/bz2/tests/with_strings.phpt -crlf /ext/dom/tests/bug40836.phpt -crlf /ext/dom/tests/domelement.phpt -crlf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
