Merge from emacs-23

[gnu-emacs] / lisp / vc / ediff-help.el

diff --git a/lisp/ediff-help.el b/lisp/vc/ediff-help.el
similarity index 99%
rename from lisp/ediff-help.el
rename to lisp/vc/ediff-help.el
index 79b6b5decf66af511863b8bbc2ae3875b4e64056..b77f5f2aafad63fbffbffeb8f6cef753b013ed0f 100644 (file)
--- a/lisp/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -4,6 +4,7 @@
 ;;   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
 
 ;; This file is part of GNU Emacs.