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 ^{4,}d
+ execute-keys ^{4,}xd
try %{
# select original marker
execute-keys /^[|]{4,}
# extend to theirs marker
- execute-keys ?^={4,}
+ execute-keys ?^={4,}x
} catch %{
# select theirs marker
- execute-keys /^={4,}
+ execute-keys /^={4,}x
}
# extend to end marker
- execute-keys ?^{4,}d
+ execute-keys ?^{4,}xd
}
} -docstring "merge using head"
@@ -73,11 +73,11 @@ define-command -override git-merge-original %{
# select head marker
execute-keys ^{4,}
# select to middle of conflict
- execute-keys ?^[|]{4,}d
+ execute-keys ?^[|]{4,}xd
# select theirs marker
execute-keys /^={4,}
# extend to end marker
- execute-keys ?^{4,}d
+ execute-keys ?^{4,}xd
}
} -docstring "merge using original"
@@ -88,7 +88,7 @@ define-command -override git-merge-new %{
# extend to theirs marker
execute-keys ?^={4,}\nd
# delete end marker
- execute-keys /^{4,}d
+ execute-keys /^{4,}xd
}
} -docstring "merge using new"