F2: the real-git modify/delete null-edge test docstring overclaimed it caught loss of the `?? theirs` fallback end-to-end. git itself leaves theirs in the working tree (stage 3) so commitMerge's `git add -A` would stage it even with the bug — the assertions pass on broken logic. Reword to state it verifies the clean-merge happy path; the real F1 regression guard lives in the fake-fs apply-pull-actions.test.ts. F3: fill the `round-?` placeholder with `round-2` in both new blocks to match the file convention (header: 'QA #119 round-2'). Comment-only; no production or test-logic changes. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
13 KiB
13 KiB