Auto merge of #46696 - kennytm:rollup, r=kennytm

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 1d4c6252f2c7503ddf6b6861250e31530d53f119..2b4f3d472632a356d67f5a01cdf7daa047a5f002 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,7 +4,7 @@
 *.cpp rust
 *.h rust
 *.rs rust
-src/etc/pkg/rust-logo.ico binary
-src/etc/pkg/rust-logo.png binary
+src/etc/installer/gfx/* binary
 *.woff binary
-src/vendor/* binary
+src/vendor/** -text
+Cargo.lock -merge