simon/nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add merge conflict keybindings

Browse source
This commit is contained in:
Simon Lasbrugnas 2026-01-19 13:49:51 +01:00
parent 1adb88a7a9
commit 061ddf7584
No known key found for this signature in database
GPG key ID: 43F4DC559B52E7FA
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lua/config/keymaps.lua
View file

@ -41,4 +41,16 @@ set("n", "<Up>", "<C-w>k")
set("n", "<Right>", "<C-w>l") set("n", "<Right>", "<C-w>l")
-- Duplicate line -- Duplicate line
set("n", "<leader>d", "mzyyp`zj") set("n", "<leader>dl", "mzyyp`zj")
-- Start merge conflict resolution
set("n", "<leader>gm", ":Git mergetool<CR>:only<CR>")
-- Diff get local
set("n", "<leader>dgl", "/\\V======<CR>d<CR>dd/\\V>>>>>><CR>dd")
-- Diff get remote
set("n", "<leader>dgr", "V/\\V======<CR>d<CR>dd/\\V>>>>>><CR>dd")
-- Diff get both
set("n", "<leader>dgb", "dd/\\V======<CR>dd/\\V>>>>>><CR>dd")