auto merge of #9371 : thestinger/rust/text, r=pnkfelix

We force the usage of LF line endings, but *only* in text files.
rust-lang · Sep 20, 2013 · c29e76b · c29e76b
2 parents a95604f + 9e3258e
commit c29e76b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,6 @@
 [attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
 
-* text eol=lf
+* text=auto eol=lf
 *.cpp rust
 *.h rust
 *.rs rust