X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.gitattributes;h=a7de7ce85593c140267bd3bafa3812859d8f259f;hb=2c462a2f776b899d46743b1b44eda976e846e61d;hp=f0b1c67bd0fdd22c92f1498e14e4174772892f5d;hpb=1206264fb222a4d868e21ecb5802602d4236a83a;p=rust.git

diff --git a/.gitattributes b/.gitattributes
index f0b1c67bd0f..a7de7ce8559 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,7 +8,7 @@
 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