Revert "ZJIT: Mark commonly-edited files as merge=union (#14865)"

This reverts commit 23287c45806cac060ed63e87176d1a87968b9267.

This looks like a mixed bag...
This commit is contained in:
Max Bernstein 2025-10-17 16:29:03 -04:00
parent 23287c4580
commit 1c119f0245

3
zjit/.gitattributes vendored
View File

@ -1,3 +0,0 @@
src/hir.rs merge=union
src/cruby_methods.rs merge=union
src/codegen.rs merge=union