gitattributes: use "union" merge driver for NEWS

This should help in reducing the spurious merge conflicts for the
NEWS file, which have already caused a great deal of confusion and
wasted time.

Suggestion by Eric Blake:
http://lists.gnu.org/archive/html/automake-patches/2012-02/msg00119.html

* .gitattributes (NEWS): Use the "union" merge driver.

diff --git a/.gitattributes b/.gitattributes
index b6c36149c2d074a6e4ff7cbcfe69fa6d28a6d4dc..6fec56e1b83be32748224f9772dd59210c3332ba 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 ChangeLog merge=merge-changelog
+NEWS merge=union
 *.texi* diff=texinfo