summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: d565bc7ac3263d4c3efd35451919094f602b92c7 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
*        text=auto
*.c      diff=cpp
*.sln    merge=union
*.vcproj merge=union
*.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