From 0f2f3bf144ee41096edd2468e54312457760a673 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Mon, 27 May 2024 07:52:11 +0200 Subject: [PATCH] fix conflicts --- lua/lazyvim/plugins/editor.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua index 5e1742b4..37bcc9cb 100644 --- a/lua/lazyvim/plugins/editor.lua +++ b/lua/lazyvim/plugins/editor.lua @@ -158,6 +158,7 @@ return { { "fr", "Telescope oldfiles", desc = "Recent" }, { "fR", LazyVim.telescope("oldfiles", { cwd = vim.uv.cwd() }), desc = "Recent (cwd)" }, -- git + { "gc", "Telescope git_commits", desc = "Commits" }, { "gs", "Telescope git_status", desc = "Status" }, -- search { 's"', "Telescope registers", desc = "Registers" },