diff options
| author | Thien-Thi Nguyen <ttn@gnuvola.org> | 2005-08-06 22:13:43 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <ttn@gnuvola.org> | 2005-08-06 22:13:43 +0000 |
| commit | 0d30b33766e277a5bff6eabc9da5afdaebd8b32a (patch) | |
| tree | 7730df2271eafcffd78e9d583816e1b38539132c /lisp/smerge-mode.el | |
| parent | 00aa417213e1668d4a86514cf5febba3e241f399 (diff) | |
| download | emacs-0d30b33766e277a5bff6eabc9da5afdaebd8b32a.tar.gz | |
Update years in copyright notice; nfc.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index a40486ffd07..6ffbdc50cf5 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1,6 +1,7 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: revision-control merge diff3 cvs conflict |