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 <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