| Shahbaz Youssefi | 5efb36b | 2019-11-25 21:14:55 | [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 |
| Jamie Madill | 4b056a1 | 2021-10-08 15:15:25 | [diff] [blame] | 12 | *.star eol=lf |
| Jamie Madill | 0c7018a | 2021-10-12 17:43:20 | [diff] [blame] | 13 | infra/config/generated/*.cfg eol=lf |
| Jamie Madill | 60e3dc1 | 2021-11-26 20:05:45 | [diff] [blame] | 14 | infra/config/generated/*.pyl eol=lf |
| Shahbaz Youssefi | 5efb36b | 2019-11-25 21:14:55 | [diff] [blame] | 15 | src/compiler/preprocessor/preprocessor_*.* eol=lf |
| 16 | src/compiler/translator/glslang_*.* eol=lf |
| Roman Lavrov | 46ff02f | 2023-05-18 17:52:29 | [diff] [blame] | 17 | src/tests/capture_tests/expected/*.* eol=lf |
| Jamie Madill | bf43372 | 2019-01-21 01:10:17 | [diff] [blame] | 18 | |
| 19 | # Git conflict markers in the json file break the code generator. |
| Jamie Madill | 53aff41 | 2019-07-11 18:06:23 | [diff] [blame] | 20 | # Using a binary merge strategy forces conflicts without changing file contents. |
| 21 | scripts/code_generation_hashes/*.json merge=binary |