mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(gs/emacs): Add bindings for smerge-keep-{lower,upper}

Browse source 
Change-Id: I83a251b551e0d6c9ca6994b8f9111ffee33653fc
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2064
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Griffin Smith 2020-10-27 16:51:22 -04:00 committed by glittershark
parent aa0b4e430c
commit a14f44b4fd
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
users/glittershark/emacs.d/+bindings.el
View file

@ -312,7 +312,9 @@ private/hlissner/snippets."
(:desc "smerge" :prefix "m"
:desc "Keep Current" :n "SPC" #'smerge-keep-current
:desc "Keep All" :n "a" #'smerge-keep-all))
:desc "Keep All" :n "a" #'smerge-keep-all
:desc "Keep Upper" :n "u" #'smerge-keep-upper
:desc "Keep Lower" :n "l" #'smerge-keep-lower))
(:desc "help" :prefix "h"
:n "h" help-map