From 8d973444177ec498359f13f9f69d6bcb3df43960 Mon Sep 17 00:00:00 2001
From: Nick Zana <me@nickzana.dev>
Date: Sun, 14 Nov 2021 19:17:20 -0500
Subject: [PATCH] Add merge keybindings

---
 lua/keybindings.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lua/keybindings.lua b/lua/keybindings.lua
index 0681cbb..361c1ec 100644
--- a/lua/keybindings.lua
+++ b/lua/keybindings.lua
@@ -42,11 +42,16 @@ map('n', '<leader>k', '<cmd>lprev<CR>zz', options) -- Go to previous item in glo
 -- Toggle the window if there are items in the qfixlist; allow recursive
 map('n', '<leader>q', '<cmd>call ToggleQFList(0)<CR>', {}) -- see plugin/navigation.vim for ToggleQFList definition
 
--- git
+-- GIT
+-- top level commands
 map('n', '<leader>gs', '<cmd>G<CR>', options) -- Show git status
 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
+
 -- LSP
 -- Use an on_attach function to only map the following keys
 -- after the language server attaches to the current buffer