sanchayanmaity
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvim: keymappings: Add mappings for DiffConflicts

This commit is contained in:
Sanchayan Maity 2021-11-17 17:29:54 +05:30
parent d989d6adbc
commit 3f61c98414
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nvim/.config/nvim/lua/keymappings.lua
View File

@ -129,3 +129,8 @@ remap('n', 'dl', '<cmd>lua vim.diagnostic.setloclist()<CR>' , opts
remap('n', 'dq', '<cmd>lua vim.diagnostic.setqflist()<CR>' , opts)
remap('n', ',d', '<cmd>lua vim.diagnostic.open_float(0, {scope="line"})<CR>' , opts)
remap('n', ',D', '<cmd>lua vim.diagnostic.open_float(0, {scope="cursor"})<CR>', opts)
-- DiffConflicts
remap('n', '<Leader>dc', ':DiffConflicts<CR>' , opts)
remap('n', '<Leader>ds', ':DiffConflictsShowHistory<CR>', opts)
remap('n', '<Leader>dw', ':DiffConflictsWithHistory<CR>', opts)