Merge branch 'doc-no-history'
[platform/upstream/automake.git] / .gitattributes
1 NEWS merge=union
2 *.texi* diff=texinfo