From eba7d4328dabca4ca5fcdb1ccaa9a8f2708ca668 Mon Sep 17 00:00:00 2001 From: Toby Vincent Date: Sat, 1 Jul 2023 15:10:53 -0500 Subject: fix(nvim): fix git conflict keymaps --- nvim/.config/nvim/lua/plugins/core.lua | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nvim') diff --git a/nvim/.config/nvim/lua/plugins/core.lua b/nvim/.config/nvim/lua/plugins/core.lua index b7ed8c2..22f8737 100644 --- a/nvim/.config/nvim/lua/plugins/core.lua +++ b/nvim/.config/nvim/lua/plugins/core.lua @@ -49,6 +49,10 @@ local M = { event = "BufReadPre", opts = { disable_diagnostics = true, + default_mappings = { + prev = "[x", + next = "]x", + }, }, }, { -- cgit v1.2.3-70-g09d2