From 777291801439248fe755f3136562c4dc53beaec6 Mon Sep 17 00:00:00 2001 From: Yuan Chiu Date: Wed, 21 May 2025 05:11:06 +0800 Subject: [PATCH] feat nvim: add git-conflict.nvim --- dot_config/nvim/exact_lua/exact_plugins/exact_components/git.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/nvim/exact_lua/exact_plugins/exact_components/git.lua b/dot_config/nvim/exact_lua/exact_plugins/exact_components/git.lua index 43889ec..1e696b9 100644 --- a/dot_config/nvim/exact_lua/exact_plugins/exact_components/git.lua +++ b/dot_config/nvim/exact_lua/exact_plugins/exact_components/git.lua @@ -1,4 +1,5 @@ return { + {'akinsho/git-conflict.nvim', version = "*", config = true}, { "kdheepak/lazygit.nvim", lazy = true,