From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 14 Feb 2012 12:21:26 +0000 (+0100)
Subject: gitattributes: use "union" merge driver for NEWS
X-Git-Tag: v1.11.3b~17^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f874f9eeb7d996a7fc56c11342e9a094a87a402a;p=thirdparty%2Fautomake.git

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 b6c36149c..6fec56e1b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 ChangeLog merge=merge-changelog
+NEWS merge=union
 *.texi* diff=texinfo