php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the NEWS merge driver if available

Browse Source 
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.
This commit is contained in:
David Soria Parra
2012-03-21 18:07:30 +01:00
parent 657547f8c4
commit ca797ca31e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -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