From 4a60706e6138992eb3a66fc9af8b77fb007dca14 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Thu, 12 Dec 2024 07:19:57 +0100
Subject: [PATCH] Revert "Stop git from merging generated files"

This reverts commit 4cbb599edf5b0762caa36ee4cbba00c5c86c1f5e.
"-merge" makes git not even do merges if they are entirely conflict-free,
which is not the behavior we want.
---
 .gitattributes | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index a02c95fbd481d..d29c15fe712f3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,10 +4,8 @@
 *.cpp rust
 *.h rust
 *.rs rust diff=rust
-*.fixed linguist-language=Rust -merge
-*.mir linguist-language=Rust -merge
-*.stderr -merge
-*.stdout -merge
+*.fixed linguist-language=Rust
+*.mir linguist-language=Rust
 src/etc/installer/gfx/* binary
 src/vendor/** -text
 Cargo.lock linguist-generated=false