From 2d46b9032a20a92baf674de22c075f690307425a Mon Sep 17 00:00:00 2001
From: kennytm <kennytm@gmail.com>
Date: Wed, 16 May 2018 23:49:58 +0800
Subject: 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 miss important details like
https://github.com/rust-lang/rust/pull/50629#discussion_r187556602
---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 2b4f3d47263..7f25bddc06c 100644
--- 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
-- 
cgit 1.4.1-3-g733a5