.gitattributes

   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