github/msysgit — pull request #24 by paulcbetts (2014-02-11 01:12:15+00:00)
Title: Nuke union merge

This reverts our custom `gitattributes` that did union merges on VS project files.

Originally, the idea was, that while this strategy is more often wrong (i.e. not what the user wanted), it also made it so that the user could fix it in Visual Studio (i.e. it didn't put conflict markers in an XML file).

However, this part isn't often even true, because it will leave off closing tags for elements, which means that VS often can't open it anyways. RIP sanity.

/cc @github/desktop