Merge from emacs--rel--22

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

diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 95f3efca93b2b3104576a4b00cade74c393fad7f..17352b03d500707dacadd11663876405bb8239fa 100644 (file)
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -1,7 +1,7 @@
 ;;; ediff-merg.el --- merging utilities
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>