mirror of
https://github.com/ruby/ruby.git
synced 2026-01-26 20:19:19 +00:00
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:
parent
23287c4580
commit
1c119f0245
3
zjit/.gitattributes
vendored
3
zjit/.gitattributes
vendored
@ -1,3 +0,0 @@
|
||||
src/hir.rs merge=union
|
||||
src/cruby_methods.rs merge=union
|
||||
src/codegen.rs merge=union
|
||||
Loading…
x
Reference in New Issue
Block a user