fix typos in src/{bootstrap,ci,etc,lib{backtrace,core,fmt_macros}}

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index e737c7946ef6136f4302146fbae243a726f10c34..2b4f3d472632a356d67f5a01cdf7daa047a5f002 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,3 +7,4 @@
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
+Cargo.lock -merge