From 4cbb599edf5b0762caa36ee4cbba00c5c86c1f5e Mon Sep 17 00:00:00 2001
From: Oli Scherer <github333195615777966@oli-obk.de>
Date: Wed, 4 Dec 2024 11:01:20 +0000
Subject: [PATCH] Stop git from merging generated files

---
 .gitattributes | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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