lelgenio/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

kak: fix git mode conflic resolution

Browse source
This commit is contained in:
Leonardo Eugênio 2024-02-12 10:54:14 -03:00
parent 10e4811c3e
commit 5ee50a33b2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
user/kakoune/git-mode.kak
View file

@ -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"