blob: 4bf73cbc8129b3e70877c5448452a1161ad7a03a [file] [log] [blame]
* text=auto
*.sln eol=crlf
*.vcxproj eol=crlf
*.vcxproj.filters eol=crlf
*.bat eol=crlf
*.rc eol=crlf
**/compiled/*.h eol=crlf
**/shaders/gen/*.inc eol=lf
*.sh eol=lf
*.gn eol=lf
*.gni eol=lf
# Git conflict markers in the json file break the code generator.
# Using a binary merge strategy forces conflicts without changing file contents.
scripts/code_generation_hashes/*.json merge=binary