diff options
| author | bradwilson <dotnetguy@gmail.com> | 2012-04-05 05:16:55 +0400 |
|---|---|---|
| committer | bradwilson <dotnetguy@gmail.com> | 2012-04-05 05:16:55 +0400 |
| commit | 0ed40839cbbc4013dc877e075ca81f4500458696 (patch) | |
| tree | 054261910efbd6a96841a142678833e8e573652c /.gitattributes | |
| parent | 111ce90b334563f57f066692c407a99f2984a772 (diff) | |
Update .gitattributes for .resx to merge=union
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index e2d3d2ca..8c73419d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -19,6 +19,7 @@ *.coffee text *.config text *.cs text diff=csharp +*.csproj text merge=union *.css text *.cshtml text *.htm text @@ -26,7 +27,7 @@ *.htm text *.js text *.msbuild text -*.resx text +*.resx text merge=union *.ruleset text *.Stylecop text *.targets text @@ -34,10 +35,8 @@ *.txt text *.vb text *.vbhtml text +*.vbproj text merge=union *.xml text *.xunit text -*.csproj text merge=union -*.vbproj text merge=union - *.sln text eol=crlf merge=union |