diff options
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 |