From 5ee50a33b26e66eb7b3f9c045b4376b4a50e8f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Mon, 12 Feb 2024 10:54:14 -0300
Subject: [PATCH] kak: fix git mode conflic resolution

---
 user/kakoune/git-mode.kak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/user/kakoune/git-mode.kak b/user/kakoune/git-mode.kak
index 419f96f..ec4ed14 100644
--- a/user/kakoune/git-mode.kak
+++ b/user/kakoune/git-mode.kak
@@ -53,18 +53,18 @@ define-command -override git-prev-merge-conflict %{
 define-command -override git-merge-head %{
     evaluate-commands -draft %{
         # delete head marker
-        execute-keys <a-/>^<lt>{4,}<ret><a-x>d
+        execute-keys <a-/>^<lt>{4,}<ret>xd
         try %{
             # select original marker
             execute-keys /^[|]{4,}<ret>
             # extend to theirs marker
-            execute-keys ?^={4,}<ret><a-x>
+            execute-keys ?^={4,}<ret>x
         } catch %{
             # select theirs marker
-            execute-keys /^={4,}<ret><a-x>
+            execute-keys /^={4,}<ret>x
         }
         # extend to end marker
-        execute-keys ?^<gt>{4,}<ret><a-x>d
+        execute-keys ?^<gt>{4,}<ret>xd
     }
 } -docstring "merge using head"
 
@@ -73,11 +73,11 @@ define-command -override git-merge-original %{
         # select head marker
         execute-keys <a-/>^<lt>{4,}<ret>
         # select to middle of conflict
-        execute-keys ?^[|]{4,}<ret><a-x>d
+        execute-keys ?^[|]{4,}<ret>xd
         # select theirs marker
         execute-keys /^={4,}<ret>
         # extend to end marker
-        execute-keys ?^<gt>{4,}<ret><a-x>d
+        execute-keys ?^<gt>{4,}<ret>xd
     }
 } -docstring "merge using original"
 
@@ -88,7 +88,7 @@ define-command -override git-merge-new %{
         # extend to theirs marker
         execute-keys ?^={4,}\n<ret>d
         # delete end marker
-        execute-keys /^<gt>{4,}<ret><a-x>d
+        execute-keys /^<gt>{4,}<ret>xd
     }
 } -docstring "merge using new"