From deca471e14e4e71b5a11635fd4cd64d5951ef8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Mon, 15 Jan 2024 01:00:49 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20style(nvim):=20correct=20column?= =?UTF-8?q?=20alignment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/nvim/lua/plugins/extras/editor/git/diffview.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/nvim/lua/plugins/extras/editor/git/diffview.lua b/.config/nvim/lua/plugins/extras/editor/git/diffview.lua index 689d872b..fbd8868a 100644 --- a/.config/nvim/lua/plugins/extras/editor/git/diffview.lua +++ b/.config/nvim/lua/plugins/extras/editor/git/diffview.lua @@ -15,12 +15,12 @@ return { { "n", "gCt", actions.conflict_choose("theirs"), { desc = "Choose the THEIRS version of a conflict" } }, { "n", "gCb", actions.conflict_choose("base"), { desc = "Choose the BASE version of a conflict" } }, { "n", "gCa", actions.conflict_choose("all"), { desc = "Choose all the versions of a conflict" } }, - { "n", "gCx", actions.conflict_choose("none"), { desc = "Delete the conflict region" } }, + { "n", "gCx", actions.conflict_choose("none"), { desc = "Delete the conflict region" } }, { "n", "gCO", actions.conflict_choose_all("ours"), { desc = "Choose the OURS version of a conflict for the whole file" } }, { "n", "gCT", actions.conflict_choose_all("theirs"), { desc = "Choose the THEIRS version of a conflict for the whole file" } }, { "n", "gCB", actions.conflict_choose_all("base"), { desc = "Choose the BASE version of a conflict for the whole file" } }, { "n", "gCA", actions.conflict_choose_all("all"), { desc = "Choose all the versions of a conflict for the whole file" } }, - { "n", "gCX", actions.conflict_choose_all("none"), { desc = "Delete the conflict region for the whole file" } }, + { "n", "gCX", actions.conflict_choose_all("none"), { desc = "Delete the conflict region for the whole file" } }, }, --stylua: ignore file_panel = { @@ -28,7 +28,7 @@ return { { "n", "gCT", actions.conflict_choose_all("theirs"), { desc = "Choose the THEIRS version of a conflict for the whole file" } }, { "n", "gCB", actions.conflict_choose_all("base"), { desc = "Choose the BASE version of a conflict for the whole file" } }, { "n", "gCA", actions.conflict_choose_all("all"), { desc = "Choose all the versions of a conflict for the whole file" } }, - { "n", "gCX", actions.conflict_choose_all("none"), { desc = "Delete the conflict region for the whole file" } }, + { "n", "gCX", actions.conflict_choose_all("none"), { desc = "Delete the conflict region for the whole file" } }, }, } end,