bfdc1d2e03
stupid merge conflicts. This was originally with the ICBM api commit but something fucked up. Anyways this should prevent future errors when .java files decide that binaries have changed.
33 lines
717 B
Text
33 lines
717 B
Text
# 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
|
|
|
|
These files are text and should be normalized (Convert crlf => lf)
|
|
*.java text
|
|
*.xml text
|
|
*.txt text
|
|
|
|
# These files are binary and should be left untouched
|
|
# (binary is a macro for -text -diff)
|
|
*.jar binary
|
|
*.so binary
|
|
*.dll binary
|