>From f874f9eeb7d996a7fc56c11342e9a094a87a402a Mon Sep 17 00:00:00 2001 Message-Id: From: Stefano Lattarini Date: Tue, 14 Feb 2012 13:21:26 +0100 Subject: [PATCH 1/2] 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. --- .gitattributes | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitattributes b/.gitattributes index b6c3614..6fec56e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ ChangeLog merge=merge-changelog +NEWS merge=union *.texi* diff=texinfo -- 1.7.7.3