Merge from emacs-23

[bpt/emacs.git] / lisp / vc / ediff-merg.el

diff --git a/lisp/ediff-merg.el b/lisp/vc/ediff-merg.el
similarity index 99%
rename from lisp/ediff-merg.el
rename to lisp/vc/ediff-merg.el
index 42cfcd5..b63bd15 100644 (file)
--- a/lisp/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -4,6 +4,7 @@
 ;;   2003, 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.