Update .gitattributes: .sln and .csproj use merge=union.
Replace NUnit with xUnit.