github/msysgit — pull request #31 by Haacked (2014-10-16 17:36:11+00:00)
Title: Remove merge=union for csproj and related files in the suggested gitattributes file

We made this decision a long time ago in https://github.com/github/msysgit/pull/24 but we only changed the default `.gitattributes` and not the one we use when we actually create a repository with GHfW (`.gitattributes.suggested`)