feat nvim: add git-conflict.nvim

2025-05-21 05:11:06 +08:00 · 2025-05-21 05:11:06 +08:00 · 7772918014
commit 7772918014
parent 0b4474fef4
1 changed files with 1 additions and 0 deletions
--- 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,