# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1287154938 -10800
# Node ID 3f8ba1f0e12a973b7ebb688d6d82620a476cbc51
# Parent  4a104ee7410810f205c6f07d4deb6eec1fcfc649# Parent  1848e3b1fc00ecbfeacc656ce26abaefe06c6ee9
merged

diff -r 4a104ee74108 -r 3f8ba1f0e12a .emacs-my
--- a/.emacs-my	Sun Oct 03 18:39:42 2010 +0300
+++ b/.emacs-my	Fri Oct 15 18:02:18 2010 +0300
@@ -774,6 +774,7 @@
     (progn
      ;; Use shell from Cygwin/MinGW.
      (setq shell-file-name "bash")
+     (setenv "SHELL" "/bin/bash")
      )
     )
   ;; (setq explicit-shell-file-name "bash")
@@ -990,6 +991,7 @@
 (setq diff-switches "-u")
 
 (setq ediff-diff-options "")
+(setq ediff-custom-diff-options "-u")
 
 ;;; ----------------------------------------------------------------
 ;;; indenting.