summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: a839a28c9965f640a6eb6f0acbcbce7424cebfdc (plain) (blame)
1
2
3
4
5
*        text=auto
*.c      diff=cpp
*.sln    merge=union
*.vcproj merge=union
*.vcxproj merge=union