1
0
mirror of https://github.com/gitattributes/gitattributes.git synced 2025-01-22 16:28:24 -05:00
Commit Graph

3 Commits

Author SHA1 Message Date
Alexander Karatarakis
c3833a528b Remove merge=union. Resolves #21 2015-11-23 11:47:12 -08:00
Alexander Karatarakis
777d627207 Update VisualStudio.gitattributes
Visual Studio 2015 additions
2015-11-23 11:44:19 -08:00
Alexander Karatarakis
e9c4312cab Separate VisualStudio.gitattributes from CSharp.gitattributes
Signed-off-by: Alexander Karatarakis <alex@karatarakis.com>
2014-05-17 17:56:21 +03:00