2013-03-23 05:19:26 -05:00
|
|
|
# This is the standard LF normalization file used on windows
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# Auto detect text files and perform LF normalization
|
2013-02-05 13:16:51 -06:00
|
|
|
* text=auto
|
2013-03-23 05:19:26 -05:00
|
|
|
|
|
|
|
|
# Custom for Visual Studio, very unlikely, but lets keep it
|
|
|
|
|
*.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
|
