diff options
| author |  sommerfeld <sommerfeld@sommerfeld.dev> | 2024-05-22 17:23:40 +0100 |
|---|---|---|
| committer | sommerfeld <sommerfeld@sommerfeld.dev> | 2024-05-22 17:23:40 +0100 |
| commit | 46e68bd9815a6a8c454bf9105b6ebe2d75f54045 (patch) | |
| tree | 57f2718de0990bbdd00f933d91f61a2f0126a3c2 /home/.config/nvim/lua/custom/plugins/git.lua | |
| parent | edaf1132d385203899d9841bed7a403782610c2c (diff) | |
| download | dotfiles-46e68bd9815a6a8c454bf9105b6ebe2d75f54045.tar.gz dotfiles-46e68bd9815a6a8c454bf9105b6ebe2d75f54045.tar.bz2 dotfiles-46e68bd9815a6a8c454bf9105b6ebe2d75f54045.zip | |
[nvim] Fix git-conflict.nvim mappings
Diffstat (limited to 'home/.config/nvim/lua/custom/plugins/git.lua')
| -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 = { |