Permalink
Browse files

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.
  • Loading branch information...
1 parent 657547f commit ca797ca31ecae10f705789fbf870a6f02e8b5f17 @dsp dsp committed Mar 21, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 .gitattributes
View
2 .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

0 comments on commit ca797ca

Please sign in to comment.