Always keep the NEWS file from the branch when merging

We usually don't want to touch the NEWS files when we merge and have the news items not merged by git. Therefore we tell git to use the 'ours' strategy for the NEWS file.
hjr3 · Mar 21, 2012 · 944e622 · 944e622
1 parent fda25d9
commit 944e622
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -21,3 +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