# HG changeset patch # User Glenn Morris # Date 1210532441 0 # Node ID cf96e7b08046fbec13c4f4712b8e7ddfe8d85aa9 # Parent 142a5698960480b8f01605291c200d3b3397d61f Re-fill copyright years. Re-fix permissions notice. diff -r 142a56989604 -r cf96e7b08046 lisp/smerge-mode.el --- a/lisp/smerge-mode.el Sun May 11 18:30:35 2008 +0000 +++ b/lisp/smerge-mode.el Sun May 11 19:00:41 2008 +0000 @@ -1,17 +1,17 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: tools revision-control merge diff3 cvs conflict ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,9 +19,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: