A real three-way merge view — ours │ result │ theirs, the middle one editable - #53

Merged

mindaugaskasp merged 8 commits into

mainfrom

feat/three-way-merge-view

Aug 11, 2026

Commits on Aug 10, 2026

feat(merge): a real three-way view — ours │ result │ theirs, the middle one editable

mindaugaskasp
and
claude
committed
e6276e6
test(theme-sweep): the merge view on all 20, and two breaks that were hiding it

mindaugaskasp
and
claude
committed
d4d2e09
docs: the merge is a view now, and the theme count has been 20 for a while

mindaugaskasp
and
claude
committed
5350a69
fix(merge): a region our side emptied is an insertion point, not a line

mindaugaskasp
and
claude
committed
06a6ac0
fix(merge): read a region's emptiness off its anchor, and five more from review

mindaugaskasp
and
claude
committed
68c136b
fix(merge): say when a mixed-ending file will be normalised, and drop the dead slots row

mindaugaskasp
and
claude
committed
e9dc53c

Commits on Aug 11, 2026

docs(spec): the audit record — nine defects, eight fixed, one filed

mindaugaskasp
and
claude
committed
271425e
fix: the two CI caught — a template over cap and a walk over its budget

mindaugaskasp
and
claude
committed
ac822bf