Skip to content
Permalink
Browse files

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.
  • Loading branch information
ethomson committed May 30, 2015
1 parent ba6b4b4 commit 4b67760991ed8677bdb9fd4ce228547a6c61e015
Showing with 0 additions and 2 deletions.
  1. +0 −2 .gitattributes
@@ -3,5 +3,3 @@

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union

0 comments on commit 4b67760

Please sign in to comment.
You can’t perform that action at this time.