FA-75695 / Text diff and three-way merge / Member archive

Hunk overlap check: adjacent hunks are treated as independent · case 05

Changes to neighbouring lines are auto-merged although the policy treats them as conflicting.

Member previewVariant 5 · 3 implementations · 10 checks per implementation

Case contract

Two patches against the same base list hunks as [old_start, old_len]. A hunk with length > 0 covers lines start..start+len-1; a zero-length hunk is an insertion after line start and sits at start+0.5. Hunks conflict when their spans overlap or are adjacent (within one line). Return sorted [i, j] index pairs of conflicting hunks from the first and second patch.

Why this case matters

Cherry-picks and concurrent patch application refuse to auto-merge changes that touch or abut the same lines.

One recorded failure

Sample boundary fixture

This sample comes from the broken implementation of a controlled reproducer.

Boundary fixture	Actual	Expected	Outcome
adjacent ranges conflict	`[]`	`[[0, 0]]`	Failed

MEMBER ARCHIVE

The complete case is available to members.

This record includes three runnable implementations, regression fixtures, execution results, and source hashes.

Member access is invitation-based. Sign in with your invited account to inspect the sources.