janek
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config/doom: remap smerge

This commit is contained in:
xeruf 2021-10-15 14:28:52 +02:00
parent 05cb260094
commit dddbb9fcab
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.config/doom/config.el
View File

@ -96,6 +96,19 @@ Version 2019-11-04 2021-02-16"
"C-=" 'doom/reset-font-size "C-=" 'doom/reset-font-size
"C-+" 'doom/increase-font-size "C-+" 'doom/increase-font-size
"C--" 'doom/decrease-font-size "C--" 'doom/decrease-font-size
:leader
"Se" '+snippets/edit
"Sm" 'smerge-mode
:map smerge-mode-map
:leader
"Ss" 'smerge-next
"Sn" 'smerge-next
"Sp" 'smerge-prev
"Sr" 'smerge-resolve
"SR" 'smerge-refine
"Su" 'smerge-keep-upper
"Si" 'smerge-keep-current
"So" 'smerge-keep-lower
) )
;;;; GLOBAL SETUP ;;;; GLOBAL SETUP