about summary refs log tree commit diff
path: root/users/glittershark
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-10-27T20·51-0400
committerglittershark <grfn@gws.fyi>2020-10-27T20·55+0000
commita14f44b4fdcc9dd62a96aa3f43b6c628f4673c24 (patch)
treeb3f48383af21fd0274ba77d460fd2f0c1e864646 /users/glittershark
parentaa0b4e430cff61d86706ca31c6aca2cbd4b276aa (diff)
feat(gs/emacs): Add bindings for smerge-keep-{lower,upper} r/1863
Change-Id: I83a251b551e0d6c9ca6994b8f9111ffee33653fc
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2064
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
Diffstat (limited to 'users/glittershark')
-rw-r--r--users/glittershark/emacs.d/+bindings.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/users/glittershark/emacs.d/+bindings.el b/users/glittershark/emacs.d/+bindings.el
index e14a77f24ae8..1911d02c4012 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