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

tekknolagi · web-flow · commit 23287c45806c · 2025-10-17T15:48:54.000-04:00
This helps the default merge driver make reasonable decisions (and
therefore avoid conflicts) when multiple people are e.g. adding tests
to src/hir.rs at the same time.
diff --git a/zjit/.gitattributes b/zjit/.gitattributes
@@ -0,0 +1,3 @@
+src/hir.rs merge=union
+src/cruby_methods.rs merge=union
+src/codegen.rs merge=union

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+src/hir.rs merge=union`
	`2`	`+src/cruby_methods.rs merge=union`
	`3`	`+src/codegen.rs merge=union`