upstream

diff --cc lisp/dired.el
index 0f453fe8f5d90dc3dcab7046c08fe2de9c3c1775,0f453fe8f5d90dc3dcab7046c08fe2de9c3c1775..364ba9f6d4747a08ac35eef250c4bd13ab6a52d1
--- 1/lisp/dired.el
--- 2/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" "\

diff --cc src/dispnew.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xterm.c
Simple merge