diff options
| author | Nikita Popov <nikic@php.net> | 2013-03-23 18:26:11 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2013-03-23 18:26:11 +0100 |
| commit | 9a56dce83fc22331cde819e67516c7a1a95ce3be (patch) | |
| tree | 33485d8ae8a72c8e86d1769fce7ae5cd3725be2c /.gitattributes | |
| parent | bda5c0b082ad78e71eb6c80b4268443f939a9bed (diff) | |
| download | php-git-9a56dce83fc22331cde819e67516c7a1a95ce3be.tar.gz | |
Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
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 |