Remove union merge driver for sln, csproj files

The union merge driver is not appropriate for sln or csproj files. It is useful (as described by Junio) to "merge two shopping lists". This will work in trivial examples for sln and csproj files, for example when one branch adds a new file and the other branch does too, but it will often silently produce corrupt output.
libgit2 · May 30, 2015 · 4b67760 · 4b67760
1 parent ba6b4b4
commit 4b67760
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,5 +3,3 @@
 
 # Custom for Visual Studio
 *.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union