add *.vcproj to .gitattributes

cefsharp · Mar 7, 2013 · 9fae725 · 9fae725
1 parent c272f3b
commit 9fae725
Show file tree

Hide file tree

Showing 2 changed files with 394 additions and 393 deletions.
diff --git a/.gitattributes b/.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