Skip to content
This repository has been archived by the owner on Sep 3, 2019. It is now read-only.

Commit

Permalink
Some C# files are UTF-16, don't corrupt them
Browse files Browse the repository at this point in the history
  • Loading branch information
anaisbetts authored and aroben committed May 2, 2012
1 parent c532bb6 commit 5f64c42
Showing 1 changed file with 33 additions and 33 deletions.
66 changes: 33 additions & 33 deletions etc/gitattributes
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,37 +13,37 @@
*.png binary *.png binary
*.gif binary *.gif binary


*.cs text diff=csharp *.cs text=auto diff=csharp
*.vb text *.vb text=auto
*.c text *.c text=auto
*.cpp text *.cpp text=auto
*.cxx text *.cxx text=auto
*.h text *.h text=auto
*.hxx text *.hxx text=auto
*.py text *.py text=auto
*.rb text *.rb text=auto
*.java text *.java text=auto
*.html text *.html text=auto
*.htm text *.htm text=auto
*.css text *.css text=auto
*.scss text *.scss text=auto
*.sass text *.sass text=auto
*.less text *.less text=auto
*.js text *.js text=auto
*.lisp text *.lisp text=auto
*.clj text *.clj text=auto
*.sql text *.sql text=auto
*.php text *.php text=auto
*.lua text *.lua text=auto
*.m text *.m text=auto
*.asm text *.asm text=auto
*.erl text *.erl text=auto
*.fs text *.fs text=auto
*.fsx text *.fsx text=auto
*.hs text *.hs text=auto


*.csproj text merge=union *.csproj text=auto merge=union
*.vbproj text merge=union *.vbproj text=auto merge=union
*.fsproj text merge=union *.fsproj text=auto merge=union
*.dbproj text merge=union *.dbproj text=auto merge=union
*.sln text eol=crlf merge=union *.sln text=auto eol=crlf merge=union

0 comments on commit 5f64c42

Please sign in to comment.