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
This commit is contained in:
2026-09-10 11:12:36 -06:00
parent b548abcf80
commit 670f6325a1
2 changed files with 66 additions and 1 deletions
+3 -1
View File
@@ -6,7 +6,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
if vim.v.shell_error ~= 0 then
vim.api.nvim_echo({
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
{ out, "WarningMsg" },
{ out, "WarningMsg" },
{ "\nPress any key to exit..." },
}, true, {})
vim.fn.getchar()
@@ -30,6 +30,8 @@ require("lazy").setup({
colorscheme = "catppuccin-mocha",
},
},
-- Import LazyVim extras for the picker
{ import = "lazyvim.plugins.extras.editor.telescope" },
-- Import LazyVim extras for languages
{ import = "lazyvim.plugins.extras.lang.go" },
{ import = "lazyvim.plugins.extras.lang.json" },