projects / platform / upstream / automake.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3974270) | patch
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)
commitf874f9eeb7d996a7fc56c11342e9a094a87a402a
tree2f9075a9fab36357ac4b37fc5c76c02dcdd572c9tree | snapshot
parent3974270e2819447efdd3f4749c8f0f910bc9388ccommit | diff
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 diff | blob | history
Domain: System / Base;