nick
/
neovim-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inverted vim-fugitive git merge keybindings

Browse Source
writing
Nick Zana 3 years ago
parent 8d97344417
commit 20eea7c025
No known key found for this signature in database
GPG Key ID: A6E59E60FE474883
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
lua/keybindings.lua
Unescape Escape View File

@ -49,8 +49,8 @@ map('n', '<leader>gc', '<cmd>G commit<CR>', options) -- git commit
map('n', '<leader>gp', '<cmd>G push<CR>', {}) -- git push map('n', '<leader>gp', '<cmd>G push<CR>', {}) -- git push
-- merge -- merge
map('n', '<leader>gh', '<cmd>diffget //3<CR>', options) -- merge from left pane map('n', '<leader>gh', '<cmd>diffget //2<CR>', options) -- merge from left pane
map('n', '<leader>gl', '<cmd>diffget //2<CR>', options) -- merge from right pane map('n', '<leader>gl', '<cmd>diffget //3<CR>', options) -- merge from right pane
-- LSP -- LSP
-- Use an on_attach function to only map the following keys -- Use an on_attach function to only map the following keys

Write Preview
Loading…
Cancel
Save