From ec12d391ce67bb573b02cc1b924e9e3207663b41 Mon Sep 17 00:00:00 2001 From: Jeremy Dormitzer Date: Sun, 21 Feb 2021 11:27:48 -0500 Subject: [PATCH] Use plain windows ediff setup --- emacs/.emacs.d/config/init-built-ins.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/emacs/.emacs.d/config/init-built-ins.el b/emacs/.emacs.d/config/init-built-ins.el index d324bab..df08da5 100644 --- a/emacs/.emacs.d/config/init-built-ins.el +++ b/emacs/.emacs.d/config/init-built-ins.el @@ -31,4 +31,9 @@ :general (normal shell-mode-map "q" #'bury-buffer)) +(use-package ediff + :straight (:type built-in) + :config + (setq ediff-window-setup-function #'ediff-setup-windows-plain)) + (provide 'init-built-ins)