The conflicts list in front of the three-way merge - #55

Merged

mindaugaskasp merged 2 commits into

mainfrom

feat/merge-conflicts-list

Aug 11, 2026

Commits on Aug 11, 2026

feat(merge): the conflicts list in front of the three-way merge

mindaugaskasp
and
claude
committed
3069cd1
fix(merge): let git spell the repo-relative path, not path.relative

mindaugaskasp
and
claude
committed
45b6486