kak: fix git mode conflic resolution
This commit is contained in:
parent
10e4811c3e
commit
5ee50a33b2
|
@ -53,18 +53,18 @@ define-command -override git-prev-merge-conflict %{
|
||||||
define-command -override git-merge-head %{
|
define-command -override git-merge-head %{
|
||||||
evaluate-commands -draft %{
|
evaluate-commands -draft %{
|
||||||
# delete head marker
|
# delete head marker
|
||||||
execute-keys <a-/>^<lt>{4,}<ret><a-x>d
|
execute-keys <a-/>^<lt>{4,}<ret>xd
|
||||||
try %{
|
try %{
|
||||||
# select original marker
|
# select original marker
|
||||||
execute-keys /^[|]{4,}<ret>
|
execute-keys /^[|]{4,}<ret>
|
||||||
# extend to theirs marker
|
# extend to theirs marker
|
||||||
execute-keys ?^={4,}<ret><a-x>
|
execute-keys ?^={4,}<ret>x
|
||||||
} catch %{
|
} catch %{
|
||||||
# select theirs marker
|
# select theirs marker
|
||||||
execute-keys /^={4,}<ret><a-x>
|
execute-keys /^={4,}<ret>x
|
||||||
}
|
}
|
||||||
# extend to end marker
|
# extend to end marker
|
||||||
execute-keys ?^<gt>{4,}<ret><a-x>d
|
execute-keys ?^<gt>{4,}<ret>xd
|
||||||
}
|
}
|
||||||
} -docstring "merge using head"
|
} -docstring "merge using head"
|
||||||
|
|
||||||
|
@ -73,11 +73,11 @@ define-command -override git-merge-original %{
|
||||||
# select head marker
|
# select head marker
|
||||||
execute-keys <a-/>^<lt>{4,}<ret>
|
execute-keys <a-/>^<lt>{4,}<ret>
|
||||||
# select to middle of conflict
|
# select to middle of conflict
|
||||||
execute-keys ?^[|]{4,}<ret><a-x>d
|
execute-keys ?^[|]{4,}<ret>xd
|
||||||
# select theirs marker
|
# select theirs marker
|
||||||
execute-keys /^={4,}<ret>
|
execute-keys /^={4,}<ret>
|
||||||
# extend to end marker
|
# extend to end marker
|
||||||
execute-keys ?^<gt>{4,}<ret><a-x>d
|
execute-keys ?^<gt>{4,}<ret>xd
|
||||||
}
|
}
|
||||||
} -docstring "merge using original"
|
} -docstring "merge using original"
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@ define-command -override git-merge-new %{
|
||||||
# extend to theirs marker
|
# extend to theirs marker
|
||||||
execute-keys ?^={4,}\n<ret>d
|
execute-keys ?^={4,}\n<ret>d
|
||||||
# delete end marker
|
# delete end marker
|
||||||
execute-keys /^<gt>{4,}<ret><a-x>d
|
execute-keys /^<gt>{4,}<ret>xd
|
||||||
}
|
}
|
||||||
} -docstring "merge using new"
|
} -docstring "merge using new"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue