summaryrefslogtreecommitdiff
path: root/.config/nvim/lua/plugins/conflict-marker.lua
AgeCommit message (Collapse)Author
2025-07-30Added conflict highlighting in nvimKyren223