From 86c828be82a36ab0e3589aa79a10b748b5ee4875 Mon Sep 17 00:00:00 2001
From: Tobias Ostner <tobias.ostner@gmail.com>
Date: Tue, 21 Nov 2023 07:42:17 +0100
Subject: [PATCH] tweak ediff

---
 .emacs.d/init.el | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 5badc66..97d7d8d 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -185,6 +185,15 @@
         ef-themes-region '(intense no-extend))
   (mapc #'disable-theme custom-enabled-themes))
 
+(use-package ediff
+  :config
+  (setq
+   ediff-keep-variants nil
+   ediff-make-buffers-readonly-at-startup nil
+   ediff-show-clashes-only t
+   ediff-split-window-function 'split-window-horizontally
+   ediff-window-setup-function 'ediff-setup-windows-plain))
+
 (use-package editorconfig)
 
 (use-package eglot