Merge branch 'sanity-sleep-fix-master'
[platform/upstream/automake.git] / .gitattributes
1 ChangeLog merge=merge-changelog
2 *.texi* diff=texinfo