Emacs: Add smerge keybindings for keep-upper and keep-lower.

init.d/programming/common.el

@@ -1,6 +1,6 @@
 ;;; common.el --- Common programming settings. -*- lexical-binding: t; -*-
 
-;; Time-stamp: <2020-05-24T22:58:35+0200>
+;; Time-stamp: <2020-06-14T17:08:44+0200>
 
 ;;; Commentary:
 
@@ -212,7 +212,9 @@ collapse other projects."
   :bind (:map smerge-mode-map
               ("<f5>" . smerge-prev)
               ("<f6>" . smerge-next)
-              ("<f7>" . smerge-resolve)))
+              ("<f7>" . smerge-resolve)
+              ("C-<f5>" . smerge-keep-upper)
+              ("C-<f6>" . smerge-keep-lower)))
 
 (use-package copyright
   :config (defun my/maybe-copyright-update ()