From 0c4dc0f100126f05484ab88b8fdfd54c8b07e3fe Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Tue, 18 Feb 2025 19:35:19 +0100
Subject: [PATCH] git/git-conflict: avoid shadowing builtin keybinds

---
 modules/plugins/git/git-conflict/git-conflict.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/plugins/git/git-conflict/git-conflict.nix b/modules/plugins/git/git-conflict/git-conflict.nix
index bffb926c..44ab79c5 100644
--- a/modules/plugins/git/git-conflict/git-conflict.nix
+++ b/modules/plugins/git/git-conflict/git-conflict.nix
@@ -12,10 +12,10 @@ in {
     setupOpts = mkPluginSetupOption "git-conflict" {};
 
     mappings = {
-      ours = mkMappingOption "Choose Ours [Git-Conflict]" "co";
-      theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "ct";
-      both = mkMappingOption "Choose Both [Git-Conflict]" "cb";
-      none = mkMappingOption "Choose None [Git-Conflict]" "c0";
+      ours = mkMappingOption "Choose Ours [Git-Conflict]" "<leader>co";
+      theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "<leader>ct";
+      both = mkMappingOption "Choose Both [Git-Conflict]" "<leader>cb";
+      none = mkMappingOption "Choose None [Git-Conflict]" "<leader>c0";
       prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x";
       nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x";
     };