From 4f160cfe775abd2e44e45bce17cced56f66b4ef0 Mon Sep 17 00:00:00 2001 From: Jeremie Fraeys <13443851+jfraeys@users.noreply.github.com> Date: Mon, 18 Sep 2023 00:36:16 -0400 Subject: [PATCH] fix git hunk conficts --- init.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/init.lua b/init.lua index 8de16ab8..34b56131 100644 --- a/init.lua +++ b/init.lua @@ -85,9 +85,6 @@ require('lazy').setup({ changedelete = { text = '~' }, }, on_attach = function(bufnr) - vim.keymap.set('n', 'gp', require('gitsigns').prev_hunk, - { buffer = bufnr, desc = '[G]o to [P]revious Hunk' }) - vim.keymap.set('n', 'gn', require('gitsigns').next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' }) vim.keymap.set('n', 'hp', require('gitsigns').preview_hunk, { buffer = bufnr, desc = 'Preview git hunk' }) -- don't override the built-in and fugitive keymaps