Merge branch 'maint' into branch-1.11
[automake.git] / .gitattributes
blob5126add6d8e5da89ad82fbb8326fd54c8964dbcf
1 NEWS merge=union
2 *.texi* diff=texinfo