--- a/.emacs-my	Mon Sep 24 19:58:13 2012 +0300
+++ b/.emacs-my	Thu Sep 27 00:33:52 2012 +0300
@@ -1862,6 +1862,7 @@
 
 (setq ediff-diff-options "")
 (setq ediff-custom-diff-options "-u")
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
 
 (when window-system
   (eval-after-load 'diff-mode