mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #63743 - alexcrichton:allow-lock-merge, r=Mark-Simulacrum

Browse Source 
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.
This commit is contained in:
Mazdak Farrokhzad 2019-08-20 16:26:44 +02:00 committed by GitHub
commit 218bcf2e01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -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