diff --git a/lisp/init-git.el b/lisp/init-git.el
index 8596bec..31afa34 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -28,4 +28,9 @@
   (setq magit-revision-show-gravatars
         '("^Author:     " . "^Commit:     ")))
 
+;;; ediff
+(setq ediff-split-window-function 'split-window-horizontally)
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+
+
 (provide 'init-git)