Mercurial > emacs
diff lisp/smerge-mode.el @ 106815:1d1d5d9bd884
Add 2010 to copyright years.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Wed, 13 Jan 2010 00:35:10 -0800 |
parents | 098f8a47a308 |
children | 46ac70591556 376148b31b5e |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Wed Jan 13 13:42:45 2010 +0900 +++ b/lisp/smerge-mode.el Wed Jan 13 00:35:10 2010 -0800 @@ -1,7 +1,7 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -;; 2007, 2008, 2009 Free Software Foundation, Inc. +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: tools revision-control merge diff3 cvs conflict