Merge branch 'yl-work-for-master'
[platform/upstream/automake.git] / .gitattributes
1 NEWS merge=union
2 *.texi* diff=texinfo