# HG changeset patch
# User Romain Francoise <romain@orebokech.com>
# Date 1130315887 0
# Node ID f2be1560adf252585e3c1d79371f4ffbae9c0c48
# Parent  902db04fb1b3e99c2037c3b8760c1f62eff5ef2c
Add 'tools' to file keywords.

diff -r 902db04fb1b3 -r f2be1560adf2 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 26 01:02:31 2005 +0000
+++ b/lisp/ChangeLog	Wed Oct 26 08:38:07 2005 +0000
@@ -1,3 +1,7 @@
+2005-10-26  Romain Francoise  <romain@orebokech.com>
+
+	* smerge-mode.el: Add 'tools' to file keywords.
+
 2005-10-26  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gud.el (gud-menu-map): Only display gud-until icon
diff -r 902db04fb1b3 -r f2be1560adf2 lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Wed Oct 26 01:02:31 2005 +0000
+++ b/lisp/smerge-mode.el	Wed Oct 26 08:38:07 2005 +0000
@@ -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.