2013-10-11 15:53:27 -07:00
|
|
|
# Auto detect text files and perform LF normalization
|
|
|
|
*text eol=lf
|
|
|
|
|
|
|
|
# Custom for Visual Studio
|
|
|
|
*.cs diff=csharp
|
2018-08-05 16:28:05 +02:00
|
|
|
#*.sln merge=union
|
|
|
|
#*.csproj merge=union
|
|
|
|
#*.vbproj merge=union
|
|
|
|
#*.fsproj merge=union
|
|
|
|
#*.dbproj merge=union
|
2013-10-11 15:53:27 -07:00
|
|
|
|
|
|
|
# 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
|