Merge from cygw32 branch

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

diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el
index 487c5e80786b0ce37bffaba911c8ed5bf1ffa40f..195b177bbc9e6bb8acf9cdf5cebf4e390ed51ddf 100644 (file)
--- a/lisp/vc/ediff-vers.el
+++ b/lisp/vc/ediff-vers.el
@@ -1,7 +1,6 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
-;; Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1997, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
@@ -236,5 +235,4 @@ comparison or merge operations are being performed."
 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;; End:
 
-;; arch-tag: bbb34f0c-2a90-426a-a77a-c75f479ebbbf
 ;;; ediff-vers.el ends here