Rollup merge of rust-lang#50809 - kennytm:show-cargo-lock-diff, r=ale…

…xcrichton GitHub: Stop treating Cargo.lock as a generated file. We do want to inspect the changes to Cargo.lock, hiding the diff by default would make it easier to miss important details like rust-lang#50629 (comment) and rust-lang#50696 (review)
kennytm · May 16, 2018 · 3c261a4 · 3c261a4
2 parents 8366780 + 2d46b90
commit 3c261a4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -7,4 +7,4 @@
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
-Cargo.lock -merge
+Cargo.lock -merge linguist-generated=false