another update to .gitattributes for csharp merges