From bb0f807d0683fcb2c0e9fdd6a5d1e54686dfc816 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Fri, 8 Mar 2013 20:38:45 -0300 Subject: mkbu95's .gitattributes Signed-off-by: shennetsind --- .gitattributes | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..3820cfc1d --- /dev/null +++ b/.gitattributes @@ -0,0 +1,10 @@ +# Auto detect text files and perform LF normalization +* text=auto +*.c diff=cpp +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union \ No newline at end of file -- cgit v1.2.3-70-g09d2