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

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents 1c6bd016193a
children 5653bdbb0b32
line wrap: on
line diff
--- a/lisp/vc/diff.el	Fri Jan 14 16:06:17 2011 +0100
+++ b/lisp/vc/diff.el	Fri Jan 14 12:18:41 2011 -0500
@@ -1,7 +1,7 @@
 ;;; diff.el --- run `diff' in compilation-mode
 
 ;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Frank Bresz
 ;; (according to authors.el)