From: Nikita Popov <nikic@php.net>
Date: Sat, 23 Mar 2013 17:26:11 +0000 (+0100)
Subject: Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS
X-Git-Tag: php-5.5.0beta2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a56dce83fc22331cde819e67516c7a1a95ce3be;p=php

Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS
---

diff --git a/.gitattributes b/.gitattributes
index 9ed6e5f4b9..79b218fcba 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