diff --git a/lua/keybindings.lua b/lua/keybindings.lua index 361c1ec..a1a0110 100644 --- a/lua/keybindings.lua +++ b/lua/keybindings.lua @@ -49,8 +49,8 @@ map('n', 'gc', 'G commit', options) -- git commit map('n', 'gp', 'G push', {}) -- git push -- merge -map('n', 'gh', 'diffget //3', options) -- merge from left pane -map('n', 'gl', 'diffget //2', options) -- merge from right pane +map('n', 'gh', 'diffget //2', options) -- merge from left pane +map('n', 'gl', 'diffget //3', options) -- merge from right pane -- LSP -- Use an on_attach function to only map the following keys