diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-20 16:26:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 16:26:44 +0200 |
| commit | 218bcf2e01146eb87afbef608f00c8df1e54b415 (patch) | |
| tree | 8bb98deaa7c2186c33196d3304c427a7264d998f | |
| parent | cadf6b9343f1069a2601dd716e4e2ca52b519171 (diff) | |
| parent | 815ce8cb1df6708682691f732c30f10ca1aecc88 (diff) | |
| download | rust-218bcf2e01146eb87afbef608f00c8df1e54b415.tar.gz rust-218bcf2e01146eb87afbef608f00c8df1e54b415.zip | |
Rollup merge of #63743 - alexcrichton:allow-lock-merge, r=Mark-Simulacrum
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.
| -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 |