added .vcxproj union merge to .gitattributes

This should help reduce unresolved merge conflicts, but may cause
deleted files/filters to stick around in the project when there is a
conflict.