Merge from emacs-23

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

diff --git a/lisp/ediff.el b/lisp/vc/ediff.el
similarity index 99%
rename from lisp/ediff.el
rename to lisp/vc/ediff.el
index bdd8b88e094961eec0d6ee995ed5bb4e8eece50d..9866f10107fde2f7fcb514e0258e0c7bfcf8d377 100644 (file)
--- a/lisp/ediff.el
+++ b/lisp/vc/ediff.el
@@ -5,7 +5,8 @@
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Created: February 2, 1994
-;; Keywords: comparing, merging, patching, tools, unix
+;; Keywords: comparing, merging, patching, vc, tools, unix
+;; Version: 2.81.4
 
 ;; Yoni Rabkin <yoni@rabkins.net> contacted the maintainer of this
 ;; file on 20/3/2008, and the maintainer agreed that when a bug is