From f991a34423f38d932982a3f578776e75c7271f9b Mon Sep 17 00:00:00 2001 From: paiden Date: Sat, 2 Apr 2016 10:19:28 +0200 Subject: [PATCH] Extend .gitattributes --- .gitattributes | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitattributes b/.gitattributes index dac36a01..2012fe64 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,12 +1,14 @@ # Enalbe auto eol handling -* text=auto !eol +* text=auto # Text Files auto handle -*.config text -*.cs text diff=csharp -*.md text -*.nuspec text -*.ps1 text +*.config text +*.cs text diff=csharp +*.md text +*.nuspec text +*.ps1 text +*.csproj text merge=union + # Text Files CR LF -*.sln text eol=crlf \ No newline at end of file +*.sln text merge=union eol=crlf \ No newline at end of file