projects / platform / upstream / automake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3974270)
gitattributes: use "union" merge driver for NEWS
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 14 Feb 2012 12:21:26 +0000 (13:21 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 14 Feb 2012 12:21:26 +0000 (13:21 +0100)
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 patch | blob | history

diff --git a/.gitattributes b/.gitattributes
index b6c3614..6fec56e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 ChangeLog merge=merge-changelog
+NEWS merge=union
 *.texi* diff=texinfo
Domain: System / Base;