diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-05-30 18:05:37 +0300 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-05-30 18:05:37 +0300 |
| commit | 4b67760991ed8677bdb9fd4ce228547a6c61e015 (patch) | |
| tree | d4c54fb41b40780af8d40b10b4a4cbfd5b288f24 | |
| parent | ba6b4b47faedbca9828afd3dd6aeaab890ea18c8 (diff) | |
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.
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index be48d622..9d132e95 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,5 +3,3 @@ # Custom for Visual Studio *.cs diff=csharp -*.sln merge=union -*.csproj merge=union |