Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Use merge=union attribute to help resolve conflicts in project and so…

…lution files
  • Loading branch information...
commit 82baa6db0987f87d114c021f2c8a6e721d9ef6b8 1 parent 1d04770
Alexander Zaytsev hazzik authored

Showing 1 changed file with 6 additions and 1 deletion. Show diff stats Hide diff stats

  1. +6 1 .gitattributes
7 .gitattributes
... ... @@ -1 +1,6 @@
1   -* -text
  1 +* -text
  2 +*.csproj merge=union
  3 +*.vbproj merge=union
  4 +*.fsproj merge=union
  5 +*.dbproj merge=union
  6 +*.sln merge=union

0 comments on commit 82baa6d

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