summaryrefslogtreecommitdiff
path: root/lua/maps
diff options
context:
space:
mode:
authorHampusM <hampus@hampusmat.com>2024-06-09 13:52:08 +0200
committerHampusM <hampus@hampusmat.com>2024-06-09 13:52:08 +0200
commit5692bf2d44358c843a132d259f0c864b07cb30b3 (patch)
tree7e39eda03315fac117cc7dd60745f1382388fd95 /lua/maps
parente775b13c6ad8939033740d8ba5e95898905f9ad2 (diff)
use telescope-git-conflicts plugin
Diffstat (limited to 'lua/maps')
-rw-r--r--lua/maps/find.lua7
1 files changed, 7 insertions, 0 deletions
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
@@ -28,6 +28,13 @@ vim.api.nvim_set_keymap(
vim.api.nvim_set_keymap(
"n",
+ "<leader>gcl",
+ ":Telescope conflicts<CR>",
+ { silent = true, noremap = true }
+)
+
+vim.api.nvim_set_keymap(
+ "n",
"<leader>f",
":Telescope live_grep<CR>",
{ silent = true, noremap = true }