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

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/01/08 20:46:54

Index: lisp/ediff-merg.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-merg.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- lisp/ediff-merg.el  27 Nov 2007 03:59:04 -0000      1.34
+++ lisp/ediff-merg.el  8 Jan 2008 20:44:36 -0000       1.35
@@ -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>