Tweak .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 5c0a591385fbb845a0fc102df785a418c26989f5..bf823b7487598b2683599d92ba1300ba7971a82a 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -120,3 +120,4 @@ lib-src/rcs2log diff=shell
 # This file contains in-line diffs, which can include trailing
 # whitespace.
 java/INSTALL -whitespace
+etc/NEWS merge=ours