mirror of
https://github.com/godotengine/godot-angle-static.git
synced 2026-01-06 02:09:55 +03:00
53aff41e47
This should reduce the number of merge conflicts when multiple people touch different generators. There still will be merge conflicts when two people touch the same code generator. Bug: angleproject:3691 Change-Id: I0b179368a1352331c091972568c00213ab106e46 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1698650 Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Ian Elliott <ianelliott@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>
16 lines
522 B
Plaintext
16 lines
522 B
Plaintext
* 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
|