PowerShell/.gitattributes

CHANGELOG.md merge=union
* text=auto
*.png binary
*.rtf binary
Set merge=union for changelog This will prevent the vast majority of conflicts with this file being updated concurrently. 2016-08-04 23:57:13 +02:00			`CHANGELOG.md merge=union`
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-26 00:14:39 +02:00			`* text=auto`
			`*.png binary`
Treat .rtf files as binary so EOL don't get changed (#5020) 2017-10-06 00:49:31 +02:00			`*.rtf binary`