Do not automatically merge Cargo.lock

rust-lang · Dec 6, 2017 · 77faf79 · 77faf79
1 parent 632ad19
commit 77faf79
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -7,3 +7,4 @@
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
+Cargo.lock -merge