4a60706e61
This reverts commit 4cbb599edf.
"-merge" makes git not even do merges if they are entirely conflict-free,
which is not the behavior we want.
17 lines
421 B
Text
17 lines
421 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 diff=rust
|
|
*.fixed linguist-language=Rust
|
|
*.mir linguist-language=Rust
|
|
src/etc/installer/gfx/* binary
|
|
src/vendor/** -text
|
|
Cargo.lock linguist-generated=false
|
|
|
|
# Older git versions try to fix line endings on images and fonts, this prevents it.
|
|
*.png binary
|
|
*.ico binary
|
|
*.woff binary
|
|
*.woff2 binary
|