feat(conflict): detect and resolve inline merge conflict markers#96

Merged

barrettruth merged 8 commits intomainfrom

Feb 8, 2026

Commits on Feb 8, 2026

fix(conflict): keep TextChanged autocmd alive after resolution
barrettruth
committed
fix(conflict): clear stale diagnostics before re-enabling
barrettruth
committed