feat(vc): integrate smerge-mode
Activates smerge-mode if the file contains merge conflict markers. Also turns binds the localleader to `smerge-mode-map` when it's active. Also removes an unused leader binding (which will never be set because :ui hydra was removed inb08c2c7
). Amend:b08c2c745f
Close: #5954
This commit is contained in:
parent
308444d612
commit
682f151176
2 changed files with 14 additions and 2 deletions
|
@ -510,8 +510,6 @@
|
|||
:desc "Copy link to remote" "y" #'+vc/browse-at-remote-kill
|
||||
:desc "Copy link to homepage" "Y" #'+vc/browse-at-remote-kill-homepage
|
||||
:desc "Git time machine" "t" #'git-timemachine-toggle
|
||||
(:when (modulep! :ui hydra)
|
||||
:desc "SMerge" "m" #'+vc/smerge-hydra/body)
|
||||
(:when (modulep! :ui vc-gutter)
|
||||
:desc "Revert hunk at point" "r" #'+vc-gutter/revert-hunk
|
||||
:desc "stage hunk at point" "s" #'+vc-gutter/stage-hunk
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue