sam_oneal/nvim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47 Commits 1 Branch 0 Tags
2906689a299e500740f026f59938c08635e1996f
Commit Graph

5 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 50a8c1fcc7 some changes 2026-01-24 00:50:45 -07:00
sam_oneal dc98d50a31 updated configuration 2026-01-12 23:12:11 -07:00
sam_oneal 6d79fde026 updated configuration 2026-01-09 19:27:28 -07:00
sam_oneal 5192d8c9e1 all initial files from lazyvim 2026-01-09 12:46:53 -07:00