Index: emacs/lisp/ediff-merg.el diff -c emacs/lisp/ediff-merg.el:1.25 emacs/lisp/ediff-merg.el:1.26 *** emacs/lisp/ediff-merg.el:1.25 Mon Jul 4 23:08:53 2005 --- emacs/lisp/ediff-merg.el Sat Aug 6 22:13:42 2005 *************** *** 1,6 **** ;;; ediff-merg.el --- merging utilities ! ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. ;; Author: Michael Kifer <[EMAIL PROTECTED]> --- 1,7 ---- ;;; ediff-merg.el --- merging utilities ! ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! ;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <[EMAIL PROTECTED]>
_______________________________________________ Emacs-diffs mailing list [email protected] http://lists.gnu.org/mailman/listinfo/emacs-diffs
