diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-14 13:21:26 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-14 13:21:26 +0100 |
| commit | f874f9eeb7d996a7fc56c11342e9a094a87a402a (patch) | |
| tree | 2f9075a9fab36357ac4b37fc5c76c02dcdd572c9 /.gitattributes | |
| parent | 3974270e2819447efdd3f4749c8f0f910bc9388c (diff) | |
| download | automake-f874f9eeb7d996a7fc56c11342e9a094a87a402a.tar.gz | |
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.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
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 |