resolved upstream merge conflicts

Author: Xandkeeper

.gitattributes

@@ -4,7 +4,8 @@
 *.cpp rust
 *.h rust
 *.rs rust
+*.fixed linguist-language=Rust
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
-Cargo.lock -merge
+Cargo.lock -merge linguist-generated=false

.gitignore

@@ -74,27 +74,30 @@ __pycache__/
 /obj/
 /rt/
 /rustllvm/
-/src/libstd_unicode/DerivedCoreProperties.txt
-/src/libstd_unicode/DerivedNormalizationProps.txt
-/src/libstd_unicode/PropList.txt
-/src/libstd_unicode/ReadMe.txt
-/src/libstd_unicode/Scripts.txt
-/src/libstd_unicode/SpecialCasing.txt
-/src/libstd_unicode/UnicodeData.txt
+/src/libcore/unicode/DerivedCoreProperties.txt
+/src/libcore/unicode/DerivedNormalizationProps.txt
+/src/libcore/unicode/PropList.txt
+/src/libcore/unicode/ReadMe.txt
+/src/libcore/unicode/Scripts.txt
+/src/libcore/unicode/SpecialCasing.txt
+/src/libcore/unicode/UnicodeData.txt
 /stage[0-9]+/
 /target
 target/
 /test/
 /tmp/
+tags
+tags.*
 TAGS
-TAGS.emacs
-TAGS.vi
+TAGS.*
 \#*
 \#*\#
 config.mk
 config.stamp
 keywords.md
 lexer.ml
+mir_dump
+Session.vim
 src/etc/dl
 tmp.*.rs
 version.md