diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..cd9b9c5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,23 @@
+# Auto detect text files and perform LF normalization
+* text 
+
+# Don't check these into the repo as LF to work around TeamCity bug
+*.xml     -text 
+*.targets -text
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Denote all files that are truly binary and should not be modified.
+*.dll binary
+*.exe binary
+*.png binary
+*.ico binary
+*.snk binary
+*.pdb binary
+*.svg binary