Skip to content

Commit 8e37e15

Browse files
committed
Auto merge of #134199 - RalfJung:gitmerge, r=oli-obk
Revert "Stop git from merging generated files" This reverts #133851. "-merge" makes git not even do merges if they are entirely conflict-free, which is not the behavior we want. We sometimes have conflict-free merges in generated files and it's much better if git can handle them automatically. r? `@oli-obk` Cc `@jieyouxu` `@Urgau`
2 parents 4606a4d + 4a60706 commit 8e37e15

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

.gitattributes

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
*.cpp rust
55
*.h rust
66
*.rs rust diff=rust
7-
*.fixed linguist-language=Rust -merge
8-
*.mir linguist-language=Rust -merge
9-
*.stderr -merge
10-
*.stdout -merge
7+
*.fixed linguist-language=Rust
8+
*.mir linguist-language=Rust
119
src/etc/installer/gfx/* binary
1210
src/vendor/** -text
1311
Cargo.lock linguist-generated=false

0 commit comments

Comments
 (0)