[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-689-g06684c5

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=06684c510ab3115093178cdcfb28c2fff41b324c

The branch, maint has been updated
       via  06684c510ab3115093178cdcfb28c2fff41b324c (commit)
       via  f874f9eeb7d996a7fc56c11342e9a094a87a402a (commit)
      from  3974270e2819447efdd3f4749c8f0f910bc9388c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .gitattributes |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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


hooks/post-receive
-- 
GNU Automake