Mercurial > emacs
comparison lisp/ediff-merg.el @ 79721:73661ddc7ac7
Add 2008 to copyright years.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Mon, 07 Jan 2008 02:45:14 +0000 |
parents | 9355f9b7bbff |
children | 107ccd98fa12 |
comparison
equal
deleted
inserted
replaced
79720:9c0b3f269b92 | 79721:73661ddc7ac7 |
---|---|
1 ;;; ediff-merg.el --- merging utilities | 1 ;;; ediff-merg.el --- merging utilities |
2 | 2 |
3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4 ;; 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. | 4 ;; 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
5 | 5 |
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
7 | 7 |
8 ;; This file is part of GNU Emacs. | 8 ;; This file is part of GNU Emacs. |
9 | 9 |