From f27c0d9e9191718601c013b098b4056ca6b907b9 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 14 Oct 2016 10:13:33 -0400 Subject: [PATCH] Fix .gitattributes This behavior should check out files in the native line ending depending on your platform. --- .gitattributes | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 60b563a8e8..13e9c11fb7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,9 @@ # This won't normalise line endings, but it will ensure that merge drivers use CRLF * -text eol=crlf -*.cs eol=crlf +*.cs text=auto +*.csproj text=auto +*.sln text=auto # Currently in-use binary file extensions *.blend binary