From 20eea7c02583c45b857eb87cfa8ba51da68bf35c Mon Sep 17 00:00:00 2001
From: Nick Zana <me@nickzana.dev>
Date: Sun, 14 Nov 2021 19:24:49 -0500
Subject: [PATCH] Fix inverted vim-fugitive git merge keybindings

---
 lua/keybindings.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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