git diff --name-only --diff-filter=U only works during an active merge
(while MERGE_HEAD exists). When the vault has stale conflict state —
e.g. after a reboot — git diff returns empty, causing conflictFiles=[]
and making the StatusBar click handler, command palette entry, and
conflict resolver modal all non-functional.
Switch to git ls-files --unmerged which reads unmerged index entries
directly and works regardless of MERGE_HEAD state.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2548a80e34