Browse files

Because I'm an idiot and started merging pending PRs before this, it …

…was just less effort to add this. Courtesy of @flagbug
  • Loading branch information...
1 parent 237f4f7 commit d1dc3c5163587ec5fd250619b6e9ff6626f93e1f @vikingcode vikingcode committed Dec 22, 2012
Showing with 22 additions and 0 deletions.
  1. +22 −0 .gitattributes
View
22 .gitattributes
@@ -0,0 +1,22 @@
+# 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

0 comments on commit d1dc3c5

Please sign in to comment.