From 84503c45d1ab6421c15f619f52511caa5f704a02 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Thu, 26 Sep 2019 08:16:16 +0200
Subject: [PATCH] Add keybindings for smerge-prev and smerge-next.

---
 init.el | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/init.el b/init.el
index e8d416a..56db88f 100644
--- a/init.el
+++ b/init.el
@@ -1,5 +1,5 @@
 ;;; init.el --- tastytea's Emacs init file.
-;; Time-stamp: <2019-09-25T19:49:55+00:00>
+;; Time-stamp: <2019-09-26T06:15:27+00:00>
 
 ;;; Commentary:
 ;; I am using this file with Emacs 26, but most of it will probably work with
@@ -419,6 +419,13 @@ With argument, do this that many times."
   (setq yasnippet-snippets-dir "")
   )
 
+(use-package smerge
+  :ensure nil                           ; builtin
+  :bind
+  ("C-<f5>" . smerge-prev)
+  ("C-<f6>" . smerge-next)
+  )
+
 ;;;;;;;;;;;;;;;;;;;; Programming / C++ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Set coding style.
 (use-package cc-mode