Skip to content
Browse files

add *.vcproj to .gitattributes

  • Loading branch information...
1 parent c272f3b commit 1b045daae5b9e9735d293309cb1f22ac54317d17 @ataranto ataranto committed Mar 6, 2013
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitattributes
View
1 .gitattributes
@@ -3,5 +3,6 @@
*.h text diff=cpp
*.cpp text diff=cpp
+*.vcproj text merge=union
*.csproj text merge=union
*.sln text merge=union eol=crlf

0 comments on commit 1b045da

Please sign in to comment.
Something went wrong with that request. Please try again.