winit-sonoma-fix/.gitattributes

# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs     diff=csharp
*.sln    merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc	 diff=astextplain
*.DOC	 diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot  diff=astextplain
*.DOT  diff=astextplain
*.pdf  diff=astextplain
*.PDF	 diff=astextplain
*.rtf	 diff=astextplain
*.RTF	 diff=astextplain

/CHANGELOG.md merge=union
Initial commit 2014-07-27 18:55:37 +10:00			`# Auto detect text files and perform LF normalization`
			`* text=auto`

			`# Custom for Visual Studio`
			`*.cs diff=csharp`
			`*.sln merge=union`
			`*.csproj merge=union`
			`*.vbproj merge=union`
			`*.fsproj merge=union`
			`*.dbproj merge=union`

			`# Standard to msysgit`
			`*.doc diff=astextplain`
			`*.DOC diff=astextplain`
			`*.docx diff=astextplain`
			`*.DOCX diff=astextplain`
			`*.dot diff=astextplain`
			`*.DOT diff=astextplain`
			`*.pdf diff=astextplain`
			`*.PDF diff=astextplain`
			`*.rtf diff=astextplain`
			`*.RTF diff=astextplain`
Set CHANGELOG.md merge style to union (#919) 2019-06-14 06:11:44 +10:00
			`/CHANGELOG.md merge=union`