diff options
| author | Max Bernstein <rubybugs@bernsteinbear.com> | 2025-10-17 15:48:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-17 15:48:54 -0400 |
| commit | 23287c45806cac060ed63e87176d1a87968b9267 (patch) | |
| tree | fcf50fbf6b5ef20da78b37829da82efc8b3ffa18 /doc | |
| parent | 0594646c0b6c94cb25f86445582623c9c98ea900 (diff) | |
ZJIT: Mark commonly-edited files as merge=union (#14865)
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.
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions