From 1c119f02456ff7dd3a4025456f8de5e50be88ef3 Mon Sep 17 00:00:00 2001
From: Max Bernstein <ruby@bernsteinbear.com>
Date: Fri, 17 Oct 2025 16:29:03 -0400
Subject: [PATCH] Revert "ZJIT: Mark commonly-edited files as merge=union
 (#14865)"

This reverts commit 23287c45806cac060ed63e87176d1a87968b9267.

This looks like a mixed bag...
---
 zjit/.gitattributes | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 zjit/.gitattributes

diff --git a/zjit/.gitattributes b/zjit/.gitattributes
deleted file mode 100644
index 2750c4c626..0000000000
--- a/zjit/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-src/hir.rs merge=union
-src/cruby_methods.rs merge=union
-src/codegen.rs merge=union