# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1268594214 -7200
# Node ID f833d68fa5ae21c56893f69345df38a629e224ff
# Parent  6ae9e98a1d534588d7e3be0f71682584460abd2c# Parent  84db44766351fb6a520c788d33acb5d7c7c64ddc
Automated merge with file:///E:\srv\hg\dot-emacs

diff -r 84db44766351 -r f833d68fa5ae .emacs-my
--- a/.emacs-my	Sun Mar 14 21:16:45 2010 +0200
+++ b/.emacs-my	Sun Mar 14 21:16:54 2010 +0200
@@ -1064,6 +1064,7 @@
 ;; backuping.
 
 (setq
+ make-backup-files t
  backup-by-copying t                           ; don't clobber symlinks
  backup-directory-alist '(("." . "~/.backup")) ; don't litter my fs tree
  delete-old-versions t                         ; delete excess backup versions silently