From 4b67760991ed8677bdb9fd4ce228547a6c61e015 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Sat, 30 May 2015 11:05:37 -0400
Subject: [PATCH] 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.
---
 .gitattributes | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index be48d6222..9d132e955 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,5 +3,3 @@
 
 # Custom for Visual Studio
 *.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union