X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.gitattributes;h=b223c8ac5fb841ed167a8c376eb1b6d5753ac0ec;hb=d11a58b6769105082a06a185660ae7cbd6dfc173;hp=2b4f3d472632a356d67f5a01cdf7daa047a5f002;hpb=8db163e53dab4f188a60bf24b4d6ebeb1ea5cab1;p=rust.git

diff --git a/.gitattributes b/.gitattributes
index 2b4f3d47263..b223c8ac5fb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,7 +4,8 @@
 *.cpp rust
 *.h rust
 *.rs rust
+*.fixed linguist-language=Rust
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
-Cargo.lock -merge
+Cargo.lock -merge linguist-generated=false