[Emacs-diffs] Changes to emacs/lisp/ediff-merg.el, v [EMACS_22_BASE]

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Glenn Morris <gm>       08/01/07 02:45:19

Index: ediff-merg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-merg.el,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -b -r1.32.2.1 -r1.32.2.2
--- ediff-merg.el       25 Jul 2007 04:47:28 -0000      1.32.2.1
+++ ediff-merg.el       7 Jan 2008 02:44:53 -0000       1.32.2.2
@@ -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 <address@hidden>