diff options
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index e9cba88ea1a..6e72071b6a0 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -4,7 +4,7 @@ ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> -;; Keywords: tools revision-control merge diff3 cvs conflict +;; Keywords: vc, tools, revision control, merge, diff3, cvs, conflict ;; This file is part of GNU Emacs. |