Mercurial > emacs

diff lisp/smerge-mode.el @ 75347:e3694f1cb928

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add 2007 to copyright years.
author Glenn Morris <rgm@gnu.org>
date Sun, 21 Jan 2007 03:53:13 +0000
parents 2b77fa42947f
children e9b063d17531 b8d9a391daf3 95d0cdf160ea
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Sun Jan 21 02:48:43 2007 +0000
+++ b/lisp/smerge-mode.el	Sun Jan 21 03:53:13 2007 +0000
@@ -1,7 +1,7 @@
 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: tools revision-control merge diff3 cvs conflict