Add git-conflict.nvim

Shatur · May 24, 2024 · 71f3b74 · 71f3b74
1 parent bcc440c
commit 71f3b74
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -238,3 +238,7 @@
 	path = pack/plugins/start/nvim-nio
 	url = [email protected]:nvim-neotest/nvim-nio.git
 	ignore = dirty
+[submodule "pack/plugins/start/git-conflict.nvim"]
+	path = pack/plugins/start/git-conflict.nvim
+	url = [email protected]:akinsho/git-conflict.nvim.git
+	ignore = dirty
diff --git a/pack/plugins/start/git-conflict.nvim b/pack/plugins/start/git-conflict.nvim
diff --git a/plugin/git_conflict.lua b/plugin/git_conflict.lua
@@ -0,0 +1 @@
+require('git-conflict').setup()