From a14f44b4fdcc9dd62a96aa3f43b6c628f4673c24 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Tue, 27 Oct 2020 16:51:22 -0400 Subject: feat(gs/emacs): Add bindings for smerge-keep-{lower,upper} Change-Id: I83a251b551e0d6c9ca6994b8f9111ffee33653fc Reviewed-on: https://cl.tvl.fyi/c/depot/+/2064 Reviewed-by: glittershark Tested-by: BuildkiteCI --- users/glittershark/emacs.d/+bindings.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit 1.4.1