From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 26 Apr 2012 15:47:14 +0000 (+0200)
Subject: maint: don't use "union" merge driver for NEWS anymore
X-Git-Tag: v1.12.0b~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=018a186636ba4078496f56a945d25087bca127a3;p=platform%2Fupstream%2Fautomake.git

maint: don't use "union" merge driver for NEWS anymore

The use of the "union" merge driver to avoid conflicts in NEWS has
proven to be problematic, as it often silently produced mis-merges
(instead of spurious conflicts, but a spurious conflict is better
than a mis-merge).  Also, our new branching policy (see automake
bug#11153 for a description) should greatly mitigate the problem of
merge conflicts in NEWS.  For further discussion, see:
<http://lists.gnu.org/archive/html/automake-patches/2012-04/msg00148.html>

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/.gitattributes b/.gitattributes
index 5126add..0d86adb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
-NEWS merge=union
 *.texi* diff=texinfo