diff options
Diffstat (limited to 'home/.config/nvim/lua/custom')
| -rw-r--r-- | home/.config/nvim/lua/custom/plugins/git.lua | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/home/.config/nvim/lua/custom/plugins/git.lua b/home/.config/nvim/lua/custom/plugins/git.lua index adc584c..02df02e 100644 --- a/home/.config/nvim/lua/custom/plugins/git.lua +++ b/home/.config/nvim/lua/custom/plugins/git.lua @@ -1,7 +1,15 @@ local map = require("mapper") return { - { 'akinsho/git-conflict.nvim', config = true }, + { + 'akinsho/git-conflict.nvim', + opts = { + default_mappings = { + next = ']x', + prev = '[x', + }, + } + }, { "NeogitOrg/neogit", dependencies = { |