maint: automake 1.11.5 and earlier generate insecure dist rules.
[m4/ericb.git] / .gitattributes
blob233cfcd7cfee12f5e8a68b5eda59ac27529faf22
1 # See ./bootstrap for some helpful ~/.gitconfig or .git/config settings
2 # needed for using these attributes effectively.
3 ChangeLog merge=merge-changelog
4 *.texi* diff=texinfo
5 null.* diff merge
6 iso8859.m4 diff merge