diff -r ed5ef1f0855f -r d1889d3244be .emacs-my
--- a/.emacs-my	Fri Oct 29 20:37:48 2010 +0300
+++ b/.emacs-my	Tue Nov 09 21:49:55 2010 +0200
@@ -509,7 +509,7 @@
   )
 
 (defun my-file-name-tmp-p (file)
-  (string-match "\\(^#.*#\\|~\\|\\.orig\\|\\.log\\)\\'" (file-name-nondirectory file)))
+  (string-match "\\(^#.*#\\|~\\|\\.orig\\|\\.log\\|^.?\\.diff\\)\\'" (file-name-nondirectory file)))
 
 (defun my-dired-flag-tmp-files ()
   "Flag all temporary files for deletion."