Skip to content

Commit 3c261a4

Browse files
committed
Rollup merge of rust-lang#50809 - kennytm:show-cargo-lock-diff, r=alexcrichton
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)
2 parents 8366780 + 2d46b90 commit 3c261a4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
src/etc/installer/gfx/* binary
88
*.woff binary
99
src/vendor/** -text
10-
Cargo.lock -merge
10+
Cargo.lock -merge linguist-generated=false

0 commit comments

Comments
 (0)