diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-03-29 01:32:44 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-03-29 01:32:44 +0100 |
| commit | cf099ba2ee4e438bae16c3670a14ce0c4390529a (patch) | |
| tree | 062683b6a7226ded35262e94c933b9bd81199314 /.gitattributes | |
| parent | f21eff8954d5956842795ea5653a9a5b8d62caa3 (diff) | |
| download | php-upstream/5.5.0_beta2.tar.gz | |
Imported Upstream version 5.5.0~beta2upstream/5.5.0_beta2
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 9ed6e5f4b..79b218fcb 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 |