From: Joakim Verona <joakim@verona.se>
Date: Fri, 28 Sep 2012 07:39:13 +0000 (+0200)
Subject: upstream
X-Git-Tag: emacs-25.0.90~3276
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be25526e5384268a6a834e701a194626ecc3ca53;p=emacs.git

upstream
---

be25526e5384268a6a834e701a194626ecc3ca53
diff --cc lisp/dired.el
index 0f453fe8f5d,0f453fe8f5d..364ba9f6d47
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@@ -3763,7 -3763,7 +3763,7 @@@ Ask means pop up a menu for the user t
  ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
  ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
  ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
--;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "2a883f0d481a8d0292eb90c09ae36a8e")
++;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "cab4c9952dac1073157ff3fa23cd93b8")
  ;;; Generated autoloads from dired-aux.el
  
  (autoload 'dired-diff "dired-aux" "\