Mercurial > emacs

diff lisp/ediff.el @ 112218:376148b31b5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add 2011 to FSF/AIST copyright years.
author Glenn Morris <rgm@gnu.org>
date Sun, 02 Jan 2011 15:50:46 -0800
parents 1d1d5d9bd884
children
line wrap: on
line diff
--- a/lisp/ediff.el	Sun Jan 02 10:58:36 2011 -0800
+++ b/lisp/ediff.el	Sun Jan 02 15:50:46 2011 -0800
@@ -1,7 +1,7 @@
 ;;; ediff.el --- a comprehensive visual interface to diff & patch
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Created: February 2, 1994