diff --git a/.gitignore b/.gitignore
index b25c15b..9beed20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *~
+.vscode
diff --git a/CSharp.gitattributes b/CSharp.gitattributes
index 4b0c5c3..0b8e2cb 100644
--- a/CSharp.gitattributes
+++ b/CSharp.gitattributes
@@ -1,5 +1,8 @@
 # Auto detect text files and perform LF normalization
-# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
-*    text=auto
+*          text=auto
 
-*.cs text diff=csharp
+*.cs       text diff=csharp
+*.cshtml   text diff=html
+*.csx      text diff=csharp
+*.sln      text eol=crlf merge=union
+*.csproj   text merge=union
diff --git a/FSharp.gitattributes b/FSharp.gitattributes
new file mode 100644
index 0000000..1dbae97
--- /dev/null
+++ b/FSharp.gitattributes
@@ -0,0 +1,7 @@
+# Auto detect text files and perform LF normalization
+*          text=auto
+
+*.fs       text diff=fsharp
+*.fsx      text diff=fsharp
+*.sln      text eol=crlf merge=union
+*.fsproj   text merge=union