summaryrefslogtreecommitdiff
path: root/tests/b3-conflict-target.txt
AgeCommit message (Expand)Author
2026-05-26test: B.7 — conflict + branch-protection enforces merge block on sagittaYuriy Andamasov
2026-05-26test: B.3 backport conflict — same file path, conflicting content vs sagittaYuriy Andamasov