diff options
| author | Ralf Jung <post@ralfj.de> | 2024-12-12 07:19:57 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-12-12 07:20:11 +0100 |
| commit | 4a60706e6138992eb3a66fc9af8b77fb007dca14 (patch) | |
| tree | 72c0ff97373a33a21547ea6800d686c771f800b3 /.gitattributes | |
| parent | 1f3bf231e160b9869e2a85260fd6805304bfcee2 (diff) | |
| download | rust-4a60706e6138992eb3a66fc9af8b77fb007dca14.tar.gz rust-4a60706e6138992eb3a66fc9af8b77fb007dca14.zip | |
Revert "Stop git from merging generated files"
This reverts commit 4cbb599edf5b0762caa36ee4cbba00c5c86c1f5e. "-merge" makes git not even do merges if they are entirely conflict-free, which is not the behavior we want.
Diffstat (limited to '.gitattributes')
| -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 |