# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1273597430 -10800
# Node ID 3414288e4a610371f1c3a8eb23fb8fd0f8ca0f02
# Parent  cc270f57ab7b531f482a01af3d4fb315f48eba19# Parent  c7f6eb04626d240af29b921cff11faf6be2bf061
Automated merge with file:///cygdrive/e/srv/hg/dot-emacs

diff -r c7f6eb04626d -r 3414288e4a61 .emacs-my
--- a/.emacs-my	Tue May 11 20:01:54 2010 +0300
+++ b/.emacs-my	Tue May 11 20:03:50 2010 +0300
@@ -656,7 +656,7 @@
        )
     (progn
      ;; Use shell from Cygwin/MinGW.
-     (setq shell-file-name "sh")
+     (setq shell-file-name "bash")
      )
     )
   ;; (setq explicit-shell-file-name "bash")