diff options
| author | Miles Bader <[email protected]> | 2008-01-08 20:46:54 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2008-01-08 20:46:54 +0000 |
| commit | 59ce725a3b68cbc324f01bc8dc5f9e07286431d1 (patch) | |
| tree | c17b8f002edf6892e273ff53214b1b23c880e69f /lisp/smerge-mode.el | |
| parent | 0664ff722152f34c2e87e9e644bbab401530b9d4 (diff) | |
| parent | bf515869577b12abd42777fb0647259920c862fc (diff) | |
Merge from emacs--rel--22
Revision: [email protected]/emacs--devo--0--patch-987
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 dcbb97bd79..b72107eb6c 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, 2006, 2007 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Stefan Monnier <[email protected]> ;; Keywords: tools revision-control merge diff3 cvs conflict |