Use merge=union attribute to help resolve conflicts in project and so…

…lution files
nhibernate · May 18, 2012 · 0d1f1fc · 0d1f1fc
1 parent bb99981
commit 0d1f1fc
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,6 @@
-* -text
+* -text
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+*.sln merge=union