Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS

diff --git a/.gitattributes b/.gitattributes
index 9ed6e5f4b9b1f4bcdf61d675b0b2a87c2ce69412..79b218fcbacfea8b0526f0fafb2d9a9152b3f185 100644 (file)
--- 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