sam_oneal/nvim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46 Commits 1 Branch 0 Tags
670f6325a11c2a14546187cec46d299b6d8b51f6
Commit Graph

2 Commits

Author SHA1 Message Date
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
sam_oneal 3b41bd1552 Added more editor features to support Golang, sql and git 2026-01-19 19:31:11 -07:00