summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorOliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>2017-12-06 15:41:03 +0100
committerOliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>2017-12-06 15:41:46 +0100
commit77faf79c0e2b8cf52a4ce9d3aaece794674ac2ae (patch)
tree3e6c8706b15b0f55a97c013f8c42ec2c585b331c /.gitattributes
parentAuto merge of #46192 - arielb1:locally-coherent, r=nikomatsakis (diff)
downloadgrust-77faf79c0e2b8cf52a4ce9d3aaece794674ac2ae.tar.gz
grust-77faf79c0e2b8cf52a4ce9d3aaece794674ac2ae.tar.bz2
grust-77faf79c0e2b8cf52a4ce9d3aaece794674ac2ae.tar.xz
Do not automatically merge Cargo.lock
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index e737c7946e..2b4f3d4726 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,3 +7,4 @@
7src/etc/installer/gfx/* binary 7src/etc/installer/gfx/* binary
8*.woff binary 8*.woff binary
9src/vendor/** -text 9src/vendor/** -text
10Cargo.lock -merge