Mercurial > emacs

diff lisp/vc/ediff-diff.el @ 112228:417b1e4d63cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents e60b0b3ed516
children 61f7601898b1
line wrap: on
line diff
--- a/lisp/vc/ediff-diff.el	Fri Jan 14 16:06:17 2011 +0100
+++ b/lisp/vc/ediff-diff.el	Fri Jan 14 12:18:41 2011 -0500
@@ -1,8 +1,7 @@
 ;;; ediff-diff.el --- diff-related utilities
 
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff