Stop git from merging generated files

This commit is contained in:
Oli Scherer 2024-12-04 11:01:20 +00:00
parent 2633e01929
commit 4cbb599edf

6
.gitattributes vendored
View file

@ -4,8 +4,10 @@
*.cpp rust
*.h rust
*.rs rust diff=rust
*.fixed linguist-language=Rust
*.mir linguist-language=Rust
*.fixed linguist-language=Rust -merge
*.mir linguist-language=Rust -merge
*.stderr -merge
*.stdout -merge
src/etc/installer/gfx/* binary
src/vendor/** -text
Cargo.lock linguist-generated=false