com php-src: Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS: .gitattributes
| From: | Nikita Popov | Date: | Sat, 23 Mar 2013 17:26:11 +0000 |
| Subject: | com php-src: Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS: .gitattributes | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71700@lists.php.net to get a copy of this message | ||
Commit: 9a56dce83fc22331cde819e67516c7a1a95ce3be
Author: Nikita Popov <nikic@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