diff options
| author | David Soria Parra <dsp@php.net> | 2012-03-21 18:07:30 +0100 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2012-03-21 18:11:41 +0100 |
| commit | ca797ca31ecae10f705789fbf870a6f02e8b5f17 (patch) | |
| tree | fdd7d0044050b05b9dd1af576f24d0138060e74a /.gitattributes | |
| parent | 657547f8c4758efcf85c73fec6d7fd8b3983d7cb (diff) | |
| download | php-git-ca797ca31ecae10f705789fbf870a6f02e8b5f17.tar.gz | |
Use the NEWS merge driver if available
As described in https://wiki.php.net/vcs/gitworkflow#the_news_file it
is possible to setup a custom merge driver for NEWS so git doesnt try
to merge it. This commit sets the default merge driver for the NEWS
file to the merge driver called NEWS.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index d8ee5cbbb3..5570b4b34e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,4 +21,4 @@ sapi/nsapi/nsapi.c ident sapi/continuity/capi.c ident Zend/RFCs/002.txt ident Zend/RFCs/003.txt ident -NEWS merge=ours +NEWS merge=NEWS |