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

chore: remove unused git merge keymaps

Browse source
This commit is contained in:
Simon Lasbrugnas 2026-03-13 15:42:31 +01:00
parent 57165d9a3d
commit 6b1dd38c1f
Signed by untrusted user who does not match committer: simon
GPG key ID: 86039876BA6ED8DE
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lua/config/keymaps.lua
View file

@ -54,9 +54,7 @@ set("n", "<leader>gm", ":Git mergetool<CR>:only<CR>")
-- Toggle vimdiff for side-by-side comparison
set("n", "<leader>dd", ":if &diff | diffoff | only | else | Gvdiffsplit! | endif<CR>")
-- Git conflict resolution (choose local/remote/both)
-- Git conflict resolution (choose local/incoming/both)
set("n", "<leader>dl", 'j?HEAD<CR>"_dd/\\V======<CR>V/\\V>>>>>><CR>"_dk')
set("n", "<leader>dc", 'j?HEAD<CR>"_dd/\\V======<CR>V/\\V>>>>>><CR>"_dk')
set("n", "<leader>dr", 'j?HEAD<CR>V/\\V======<CR>"_d/\\V>>>>>><CR>"_ddk')
set("n", "<leader>di", 'j?HEAD<CR>V/\\V======<CR>"_d/\\V>>>>>><CR>"_ddk')
set("n", "<leader>db", 'j?HEAD<CR>"_dd/\\V======<CR>"_dd/\\V>>>>>><CR>"_dd2k')