Commit graph

3 commits

Author SHA1 Message Date
Steve Lee b7f3dfee81 Treat .rtf files as binary so EOL don't get changed (#5020) 2017-10-05 15:49:31 -07:00
Steve Lee 901a61bcc1 Enable auto EOL on git repo side, fix some character encoding issues (#4912)
- add ending newline to files missing it using:
`awk -F: '$2 ~ / no line terminators/ {print $1}' ~/text-files.txt | xargs -I{} sh -c 'printf "\n" >> "$1"' - {}`
- update .gitattributes to enforce autocrlf on all text files
- added <copyright> opening element where it was missing
removed file attribute pointing to wrong filename
- fix mis-encoded character to apostrophe
- replace incorrect encoding of copyright symbol with (c)
- updated file hashes in the test
2017-09-25 15:14:39 -07:00
Andrew Schwartzmeyer d3e5ff9ba8 Set merge=union for changelog
This will prevent the vast majority of conflicts with this file being
updated concurrently.
2016-08-04 14:57:13 -07:00