| Shahbaz Youssefi | 5efb36b | 2019-11-25 16:14:55 -0500 | [diff] [blame] | 1 | * text=auto |
| 2 | *.sln eol=crlf |
| 3 | *.vcxproj eol=crlf |
| 4 | *.vcxproj.filters eol=crlf |
| 5 | *.bat eol=crlf |
| 6 | *.rc eol=crlf |
| 7 | **/compiled/*.h eol=crlf |
| 8 | **/shaders/gen/*.inc eol=lf |
| 9 | *.sh eol=lf |
| 10 | *.gn eol=lf |
| 11 | *.gni eol=lf |
| 12 | src/compiler/preprocessor/preprocessor_*.* eol=lf |
| 13 | src/compiler/translator/glslang_*.* eol=lf |
| Jamie Madill | bf43372 | 2019-01-20 20:10:17 -0500 | [diff] [blame] | 14 | |
| 15 | # Git conflict markers in the json file break the code generator. |
| Jamie Madill | 53aff41 | 2019-07-11 14:06:23 -0400 | [diff] [blame] | 16 | # Using a binary merge strategy forces conflicts without changing file contents. |
| 17 | scripts/code_generation_hashes/*.json merge=binary |