rust/.gitattributes
Alex Crichton 815ce8cb1d 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.
2019-08-20 06:56:46 -07:00

15 lines
357 B
Text

[attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
* text=auto eol=lf
*.cpp rust
*.h rust
*.rs rust
*.fixed linguist-language=Rust
src/etc/installer/gfx/* binary
*.woff binary
src/vendor/** -text
Cargo.lock linguist-generated=false
# Older git versions try to fix line endings on images, this prevents it.
*.png binary
*.ico binary