sam_oneal 670f6325a1 feat: add merge conflict UI and telescope picker ...

- Add unclash.nvim for interactive merge conflict resolution
  (inline highlighting, action buttons, 3-way merge editor,
  snacks picker integration)
- Enable LazyVim telescope extra with fzf-native for fuzzy finding

2026-09-10 11:12:36 -06:00

..

config

feat: add merge conflict UI and telescope picker

2026-09-10 11:12:36 -06:00

overseer/template/user

added support to use overseer commands with odin projects

2026-07-07 15:09:26 -06:00

plugins

feat: add merge conflict UI and telescope picker

2026-09-10 11:12:36 -06:00