summaryrefslogtreecommitdiff
path: root/lisp/smerge-mode.el
diff options
context:
space:
mode:
authorRomain Francoise <romain@orebokech.com>2005-10-26 08:38:07 +0000
committerRomain Francoise <romain@orebokech.com>2005-10-26 08:38:07 +0000
commit9700a45fa2670160991351d687ce5d2509b05393 (patch)
tree7c57c9ca8083011f216e008dd2e8306daaa4a910 /lisp/smerge-mode.el
parent3cae51964d23e83cef93e6d124ee0b19d92b027b (diff)
downloademacs-9700a45fa2670160991351d687ce5d2509b05393.tar.gz
Add 'tools' to file keywords.
Diffstat (limited to 'lisp/smerge-mode.el')
-rw-r--r--lisp/smerge-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index e777f3f8211..87c572372b0 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -4,7 +4,7 @@
;; 2004, 2005 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
-;; Keywords: revision-control merge diff3 cvs conflict
+;; Keywords: tools revision-control merge diff3 cvs conflict
;; This file is part of GNU Emacs.