Rollup merge of #76858 - rcvalle:rust-lang-exploit-mitigations, r=steveklabnik

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index f0b1c67bd0fdd22c92f1498e14e4174772892f5d..ac0a71232efc9457b434da02d25cd232394d3785 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,12 +3,13 @@
 * text=auto eol=lf
 *.cpp rust
 *.h rust
-*.rs rust
+*.rs rust diff=rust
 *.fixed linguist-language=Rust
+*.mir linguist-language=Rust
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
-Cargo.lock -merge linguist-generated=false
+Cargo.lock linguist-generated=false
 
 # Older git versions try to fix line endings on images, this prevents it.
 *.png binary