diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/.gitattributes b/.gitattributes index 3820cfc1d..a839a28c9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,5 @@ -# 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 +*.vcproj merge=union +*.vcxproj merge=union
\ No newline at end of file |