From c7393c9114f3a9a9e1f2cc70267d75b806fbfc8a Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Sat, 16 Sep 2023 11:20:04 +0200 Subject: [PATCH] nvim: Move between git conflict hunks with ][H Since we move between git chunks with ]h/[h, we may as well move between git *conflict* chunks (should there be any) with ]H and [H mirroring the diagnostics/error setup situation. --- nvim/.config/nvim/lua/plugins/git.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nvim/.config/nvim/lua/plugins/git.lua b/nvim/.config/nvim/lua/plugins/git.lua index 21e7deb..3c52bad 100644 --- a/nvim/.config/nvim/lua/plugins/git.lua +++ b/nvim/.config/nvim/lua/plugins/git.lua @@ -11,8 +11,8 @@ return { vim.keymap.set("n", "hO", "(git-conflict-theirs)", { desc = "Conflict use theirs" }) vim.keymap.set("n", "hm", "(git-conflict-both)", { desc = "Conflict use both" }) vim.keymap.set("n", "hM", "(git-conflict-none)", { desc = "Conflict use none" }) - vim.keymap.set("n", "[x", "(git-conflict-prev-conflict)", { desc = "Prev git conflict" }) - vim.keymap.set("n", "]x", "(git-conflict-next-conflict)", { desc = "Next git conflict" }) + vim.keymap.set("n", "[H", "(git-conflict-prev-conflict)", { desc = "Prev git conflict" }) + vim.keymap.set("n", "]H", "(git-conflict-next-conflict)", { desc = "Next git conflict" }) end, lazy = false, -- TODO needs to be force refreshed in lazy loaded mode unfortunately },