mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow git to merge Cargo.lock

Browse source 
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:
Alex Crichton 2019-08-20 06:56:46 -07:00
parent f86521e0a3
commit 815ce8cb1d
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 src/etc/installer/gfx/* binary
*.woff binary *.woff binary
src/vendor/** -text 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. # Older git versions try to fix line endings on images, this prevents it.
*.png binary *.png binary