From ca797ca31ecae10f705789fbf870a6f02e8b5f17 Mon Sep 17 00:00:00 2001
From: David Soria Parra <dsp@php.net>
Date: Wed, 21 Mar 2012 18:07:30 +0100
Subject: [PATCH] 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.
---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index d8ee5cbbb3e..5570b4b34ec 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