diff options
| author | bors <bors@rust-lang.org> | 2024-12-12 12:02:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-12 12:02:38 +0000 |
| commit | 8e37e151835d96d6a7415e93e6876561485a3354 (patch) | |
| tree | 9786078f5053ee1c9dbd6453bda91bc753dbd7f0 | |
| parent | 4606a4d6fab93e53b54a4312c82e715eab8e122d (diff) | |
| parent | 4a60706e6138992eb3a66fc9af8b77fb007dca14 (diff) | |
| download | rust-8e37e151835d96d6a7415e93e6876561485a3354.tar.gz rust-8e37e151835d96d6a7415e93e6876561485a3354.zip | |
Auto merge of #134199 - RalfJung:gitmerge, r=oli-obk
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`
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index a02c95fbd48..d29c15fe712 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 |