diff options
| author | Thien-Thi Nguyen <ttn@gnuvola.org> | 2006-02-06 15:23:23 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <ttn@gnuvola.org> | 2006-02-06 15:23:23 +0000 |
| commit | aaef169dc63c4b557374540756865991e1bf6305 (patch) | |
| tree | fb2c890b2ede8e1cde92163f4b00c8bf7dbf2c2b /lisp/smerge-mode.el | |
| parent | 8b9d426ab7ec7ee74158f113675a788e580945b4 (diff) | |
| download | emacs-aaef169dc63c4b557374540756865991e1bf6305.tar.gz | |
Update years in copyright notice; nfc.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 87c572372b0..9fddc4b1a05 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1,7 +1,7 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: tools revision-control merge diff3 cvs conflict |