blob: fc5d31fbd485316347f80e6ed249077e37862216 [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 a conflict without changing the file.
scripts/run_code_generation_hashes.json merge=binary