Barrett Ruth e40bc055b4 fix(merge): clear resolved state on buffer re-read ... Problem: resolved_hunks and virtual text persisted when a diff buffer was re-read, showing stale (resolved) markers for hunks that were no longer resolved. Solution: clear resolved_hunks[bufnr] and the merge namespace at the top of setup_keymaps so each buffer init starts fresh.		2026-02-09 13:54:52 -05:00
..
diffs	fix(merge): clear resolved state on buffer re-read	2026-02-09 13:54:52 -05:00