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:
+3
-1
@@ -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" },
|
||||
|
||||
Reference in New Issue
Block a user