2014-04-01 19:31:55 -04: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
|
|
|
|
|
|
2015-12-19 23:46:52 -05:00
|
|
|
# Custom for Xcode
|
|
|
|
|
*.pbxproj merge=union
|
|
|
|
|
|
2014-04-01 19:31:55 -04:00
|
|
|
# Standard to msysgit
|
2014-08-05 22:10:28 -04:00
|
|
|
*.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
|
