diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2019-08-20 06:56:46 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2019-08-20 06:56:46 -0700 |
| commit | 815ce8cb1df6708682691f732c30f10ca1aecc88 (patch) | |
| tree | 03f31fd0ca31da95bf220b78ebeef09206f8c5d1 /.gitattributes | |
| parent | f86521e0a33a2b54c4c23dbfc5250013f7a33b11 (diff) | |
| download | rust-815ce8cb1df6708682691f732c30f10ca1aecc88.tar.gz rust-815ce8cb1df6708682691f732c30f10ca1aecc88.zip | |
Allow git to merge `Cargo.lock`
This commit backs out #46539 in order to fully leverage #63579 where `git` should be able to merge `Cargo.lock` nowadays with only minimal conflicts.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index f0b1c67bd0f..a7de7ce8559 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,7 +8,7 @@ src/etc/installer/gfx/* binary *.woff binary src/vendor/** -text -Cargo.lock -merge linguist-generated=false +Cargo.lock linguist-generated=false # Older git versions try to fix line endings on images, this prevents it. *.png binary |