From 6b1dd38c1f0df5dc105b36da9d8decdb24ab2b5e Mon Sep 17 00:00:00 2001
From: Simon Lasbrugnas <simon.lasbrugnas@gmail.com>
Date: Fri, 13 Mar 2026 15:42:31 +0100
Subject: [PATCH] chore: remove unused git merge keymaps

---
 lua/config/keymaps.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 63941ea..d8e3e3f 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -54,9 +54,7 @@ set("n", "<leader>gm", ":Git mergetool<CR>:only<CR>")
 -- Toggle vimdiff for side-by-side comparison
 set("n", "<leader>dd", ":if &diff | diffoff | only | else | Gvdiffsplit! | endif<CR>")
 
--- Git conflict resolution (choose local/remote/both)
+-- Git conflict resolution (choose local/incoming/both)
 set("n", "<leader>dl", 'j?HEAD<CR>"_dd/\\V======<CR>V/\\V>>>>>><CR>"_dk')
-set("n", "<leader>dc", 'j?HEAD<CR>"_dd/\\V======<CR>V/\\V>>>>>><CR>"_dk')
-set("n", "<leader>dr", 'j?HEAD<CR>V/\\V======<CR>"_d/\\V>>>>>><CR>"_ddk')
 set("n", "<leader>di", 'j?HEAD<CR>V/\\V======<CR>"_d/\\V>>>>>><CR>"_ddk')
 set("n", "<leader>db", 'j?HEAD<CR>"_dd/\\V======<CR>"_dd/\\V>>>>>><CR>"_dd2k')