From 061ddf7584eb0e877cf03147ec9a5404838d8ddb Mon Sep 17 00:00:00 2001
From: Simon Lasbrugnas <simon.lasbrugnas@gmail.com>
Date: Mon, 19 Jan 2026 13:49:51 +0100
Subject: [PATCH] feat: add merge conflict keybindings

---
 lua/config/keymaps.lua | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 1076506..c9b2cc9 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -41,4 +41,16 @@ set("n", "<Up>", "<C-w>k")
 set("n", "<Right>", "<C-w>l")
 
 -- Duplicate line
-set("n", "<leader>d", "mzyyp`zj")
+set("n", "<leader>dl", "mzyyp`zj")
+
+-- Start merge conflict resolution
+set("n", "<leader>gm", ":Git mergetool<CR>:only<CR>")
+
+-- Diff get local
+set("n", "<leader>dgl", "/\\V======<CR>d<CR>dd/\\V>>>>>><CR>dd")
+
+-- Diff get remote
+set("n", "<leader>dgr", "V/\\V======<CR>d<CR>dd/\\V>>>>>><CR>dd")
+
+-- Diff get both
+set("n", "<leader>dgb", "dd/\\V======<CR>dd/\\V>>>>>><CR>dd")