[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

[Thien-Thi Nguyen]

Index: emacs/lisp/smerge-mode.el
diff -u emacs/lisp/smerge-mode.el:1.46 emacs/lisp/smerge-mode.el:1.47
--- emacs/lisp/smerge-mode.el:1.46      Wed Oct 26 08:38:07 2005
+++ emacs/lisp/smerge-mode.el   Mon Feb  6 14:33:35 2006
@@ -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 <address@hidden>
 ;; Keywords: tools revision-control merge diff3 cvs conflict