2012-10-12 04:55:30 +00:00
|
|
|
# Auto detect text files and perform LF normalization
|
|
|
|
* text=auto
|
|
|
|
|
|
|
|
*.cs text diff=csharp
|
|
|
|
*.java text diff=java
|
|
|
|
*.html text diff=html
|
|
|
|
*.py text diff=python
|
|
|
|
*.pl text diff=perl
|
|
|
|
*.pm text diff=perl
|
|
|
|
*.css text
|
|
|
|
*.js text
|
|
|
|
*.sql text
|
|
|
|
|
|
|
|
*.sh text eol=lf
|
|
|
|
|
2013-10-14 17:13:38 +00:00
|
|
|
*.bat text eol=crlf
|
|
|
|
*.cmd text eol=crlf
|
|
|
|
*.vcxproj text merge=union eol=crlf
|
|
|
|
*.csproj text merge=union eol=crlf
|
|
|
|
*.sln text merge=union eol=crlf
|