procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add 2010 to copyright years.

Browse source
This commit is contained in:
Glenn Morris 2010-01-13 00:35:10 -08:00
parent c2623ee747
commit 114f9c9679
1983 changed files with 2093 additions and 2089 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/smerge-mode.el
View file

@ -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