mirror of
https://github.com/doomemacs/doomemacs
synced 2025-08-03 12:27:26 -05:00
fix(vc): smerge localleader keybinds
The keybinding in682f151
was being overwritten. I'll simply copy the keymap into the module, until I can devise a more elegant solution. Amend:682f151176
Ref: #5954
This commit is contained in:
@ -56,7 +56,25 @@
|
||||
(when (re-search-forward "^<<<<<<< " nil t)
|
||||
(smerge-mode 1))))))
|
||||
:config
|
||||
(define-key smerge-mode-map (kbd doom-localleader-key) smerge-basic-map))
|
||||
(map! :map smerge-mode-map
|
||||
:localleader
|
||||
"n" #'smerge-next
|
||||
"p" #'smerge-prev
|
||||
"r" #'smerge-resolve
|
||||
"a" #'smerge-keep-all
|
||||
"b" #'smerge-keep-base
|
||||
"o" #'smerge-keep-lower
|
||||
"l" #'smerge-keep-lower
|
||||
"m" #'smerge-keep-upper
|
||||
"u" #'smerge-keep-upper
|
||||
"E" #'smerge-ediff
|
||||
"C" #'smerge-combine-with-next
|
||||
"R" #'smerge-refine
|
||||
"C-m" #'smerge-keep-current
|
||||
(:prefix "="
|
||||
"<" #'smerge-diff-base-upper
|
||||
">" #'smerge-diff-base-lower
|
||||
"=" #'smerge-diff-upper-lower)))
|
||||
|
||||
|
||||
(after! git-timemachine
|
||||
|
Reference in New Issue
Block a user