diff options
Diffstat (limited to 'users/glittershark/emacs.d/+bindings.el')
| -rw-r--r-- | users/glittershark/emacs.d/+bindings.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/users/glittershark/emacs.d/+bindings.el b/users/glittershark/emacs.d/+bindings.el index e14a77f24a..1911d02c40 100644 --- a/users/glittershark/emacs.d/+bindings.el +++ b/users/glittershark/emacs.d/+bindings.el @@ -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 |