aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc/diff-mode.el
diff options
context:
space:
mode:
authorStefan Monnier <[email protected]>2011-01-14 12:18:41 -0500
committerStefan Monnier <[email protected]>2011-01-14 12:18:41 -0500
commit77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch)
tree258514dac7faab41642d8f319eb113c8a5f09690 /lisp/vc/diff-mode.el
parent8faba62c38f67693535c3471d867e66757b3b04e (diff)
parentfb724e553757e9d3344be443ab5f329afc9bf91c (diff)
Merge from emacs-23
Diffstat (limited to 'lisp/vc/diff-mode.el')
-rw-r--r--lisp/vc/diff-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index c16c2460e7..e8c79aead6 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1,7 +1,7 @@
;;; diff-mode.el --- a mode for viewing/editing context diffs
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,2005, 2006,
-;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Stefan Monnier <[email protected]>
;; Keywords: convenience patch diff vc