bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #134199 - RalfJung:gitmerge, r=oli-obk

Browse source 
Revert "Stop git from merging generated files"

This reverts https://github.com/rust-lang/rust/pull/133851. "-merge" makes git not even do merges if they are entirely conflict-free, which is not the behavior we want. We sometimes have conflict-free merges in generated files and it's much better if git can handle them automatically.

r? `@oli-obk`
Cc `@jieyouxu` `@Urgau`
This commit is contained in:
bors 2024-12-12 12:02:38 +00:00
commit 8e37e15183
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitattributes vendored
View file

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