diff --git a/init.org b/init.org
index a5d8160..fe83a0c 100644
--- a/init.org
+++ b/init.org
@@ -582,6 +582,8 @@ try out =diff-hl= for highlighting diffs in magit:
     "gSb" 'magit-blame)
   :config
   (setq magit-mode-quit-window 'magit-restore-window-configuration
+        ediff-window-setup-function #'ediff-setup-windows-plain
+        ediff-merge-split-window-function #'split-window-horizontally
         ;;magit-auto-revert-mode t
         ))
 #+end_src