diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index a839a28c9..d565bc7ac 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,4 +2,10 @@ *.c diff=cpp *.sln merge=union *.vcproj merge=union -*.vcxproj merge=union
\ No newline at end of file +*.vcxproj merge=union + +# libconfig generated files +3rdparty/libconfig/grammar.c linguist-generated=true +3rdparty/libconfig/grammar.h linguist-generated=true +3rdparty/libconfig/scanner.c linguist-generated=true +3rdparty/libconfig/scanner.h linguist-generated=true |