.gitattributes 1.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253
  1. ###############################################################################
  2. # Set default behavior to automatically normalize line endings.
  3. ###############################################################################
  4. * text=auto
  5. ###############################################################################
  6. # Set the merge driver for project and solution files
  7. #
  8. # Merging from the command prompt will add diff markers to the files if there
  9. # are conflicts (Merging from VS is not affected by the settings below, in VS
  10. # the diff markers are never inserted). Diff markers may cause the following
  11. # file extensions to fail to load in VS. An alternative would be to treat
  12. # these files as binary and thus will always conflict and require user
  13. # intervention with every merge. To do so, just comment the entries below and
  14. # uncomment the group further below
  15. ###############################################################################
  16. *.sln text eol=crlf
  17. *.csproj text eol=crlf
  18. *.vbproj text eol=crlf
  19. *.vcxproj text eol=crlf
  20. *.vcproj text eol=crlf
  21. *.dbproj text eol=crlf
  22. *.fsproj text eol=crlf
  23. *.lsproj text eol=crlf
  24. *.wixproj text eol=crlf
  25. *.modelproj text eol=crlf
  26. *.sqlproj text eol=crlf
  27. *.wmaproj text eol=crlf
  28. *.xproj text eol=crlf
  29. *.props text eol=crlf
  30. *.filters text eol=crlf
  31. *.vcxitems text eol=crlf
  32. #*.sln merge=binary
  33. #*.csproj merge=binary
  34. #*.vbproj merge=binary
  35. #*.vcxproj merge=binary
  36. #*.vcproj merge=binary
  37. #*.dbproj merge=binary
  38. #*.fsproj merge=binary
  39. #*.lsproj merge=binary
  40. #*.wixproj merge=binary
  41. #*.modelproj merge=binary
  42. #*.sqlproj merge=binary
  43. #*.wwaproj merge=binary
  44. #*.xproj merge=binary
  45. #*.props merge=binary
  46. #*.filters merge=binary
  47. #*.vcxitems merge=binary