From dc85ff503644d976043166e51c1158f41ea9e4f9 Mon Sep 17 00:00:00 2001 From: Marcin Dobosz Date: Sat, 12 Aug 2017 06:51:12 -0700 Subject: [PATCH] Add .gitattributes --- .gitattributes | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..1c2a5607 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,24 @@ +* text=auto + +*.bat text +*.config text +*.cs text diff=csharp +*.csproj text merge=union +*.nuspec text +*.resx text merge=union +*.ruleset text +*.settings text +*.targets text +*.txt text +*.vb text +*.vbproj text merge=union +*.vsixmanifest text +*.vstemplate text +*.xml text +*.xsl text +*.xslt text +*.xunit text + +*.sln text eol=crlf merge=union + +.gitmodules text eol=lf \ No newline at end of file