Permalink
Browse files

Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS

  • Loading branch information...
1 parent bda5c0b commit 9a56dce83fc22331cde819e67516c7a1a95ce3be @nikic nikic committed Mar 23, 2013
Showing with 2 additions and 0 deletions.
  1. +2 −0 .gitattributes
View
2 .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

0 comments on commit 9a56dce

Please sign in to comment.