diff -r dd77820b51c4 -r 71e5a962381e .emacs-my
--- a/.emacs-my	Thu Jul 22 16:33:24 2010 +0300
+++ b/.emacs-my	Sun Jul 25 11:10:35 2010 +0300
@@ -888,10 +888,12 @@
       my-devel-mode-hook-list)
 
 ;; ----------------------------------------------------------------------
-;; diff, patch.
+;; diff, patch, ediff, emerge.
 
 (setq diff-switches "-u")
 
+(setq ediff-diff-options "")
+
 ;; ----------------------------------------------------------------------
 ;; indenting.
 
@@ -913,11 +915,6 @@
     (setq i (- i 4))))
 
 ;; ----------------------------------------------------------------------
-;; diff.
-
-(setq ediff-diff-options "")
-
-;; ----------------------------------------------------------------------
 ;; *Compile*
 
 (setq compile-auto-highlight t