test: validate imported merge conflicts against kit #77 - #125

Merged

wesm merged 10 commits into

mainfrom

kenn-forge/issue-112-merge-driver-override-reports-conflicts-without-conflict-markers

Sep 1, 2026

Commits on Aug 31, 2026

docs: record merge-driver validation design

wesm
and
codex
committed
22466f3

Commits on Sep 1, 2026

docs: clarify merge-driver validation handoff

wesm
and
codex
committed
3333c8f
docs: add merge-driver validation plan

wesm
and
codex
committed
f1c58a4
test: reproduce unmarked imported merge conflicts

wesm
and
codex
committed
d5e1503
build: validate imported merges against kit PR 77

wesm
and
codex
committed
28000c5
docs: align merge validation fixture plan

wesm
and
codex
committed
f02c895
docs: document pull-request Git version floor

wesm
and
codex
committed
e4a7ae1
test: make imported merge regression deterministic

wesm
and
codex
committed
53f0256
test: give imported merge fixture a Git identity

wesm
and
codex
committed
e34705d
build: use released kit v0.23.0

wesm
and
codex
committed
f780009