From 5692bf2d44358c843a132d259f0c864b07cb30b3 Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Sun, 9 Jun 2024 13:52:08 +0200
Subject: use telescope-git-conflicts plugin

---
 lua/maps/find.lua        |  7 +++++++
 lua/plugins.lua          | 11 +++++++++++
 lua/telescope_config.lua |  6 +++---
 3 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'lua')

diff --git a/lua/maps/find.lua b/lua/maps/find.lua
index e1071f5..d886d8a 100644
--- a/lua/maps/find.lua
+++ b/lua/maps/find.lua
@@ -26,6 +26,13 @@ vim.api.nvim_set_keymap(
 	{ silent = true, noremap = true }
 )
 
+vim.api.nvim_set_keymap(
+	"n",
+	"<leader>gcl",
+	":Telescope conflicts<CR>",
+	{ silent = true, noremap = true }
+)
+
 vim.api.nvim_set_keymap(
 	"n",
 	"<leader>f",
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 8a36e7c..f399c25 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -113,6 +113,17 @@ return require("packer").startup(function(use)
 			}
 		}
 	}
+
+	use {
+		"Snikimonkd/telescope-git-conflicts.nvim",
+		commit = "1ac7040f601d16ab3800bdda6f5912a0e385cb29",
+		requires = {
+			{
+				"nvim-lua/plenary.nvim",
+				commit = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"
+			}
+		}
+	}
 	-- Telescope end
 
 	-- Markdown
diff --git a/lua/telescope_config.lua b/lua/telescope_config.lua
index 572e6bd..04719cb 100644
--- a/lua/telescope_config.lua
+++ b/lua/telescope_config.lua
@@ -7,6 +7,6 @@ require("telescope").setup({
 	}
 })
 
-require('telescope').load_extension("fzf")
-require('telescope').load_extension("file_browser")
-
+require("telescope").load_extension("fzf")
+require("telescope").load_extension("file_browser")
+require("telescope").load_extension("conflicts")
-- 
cgit v1.2.3-18-g5258