# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1083359562 0
# Node ID 5a03a9eab24ea7031aaaad5bd87eeafbb628cee8
# Parent  04a44f089cc172184aba165be5b2f01ca4da3f75
*** empty log message ***

diff -r 04a44f089cc1 -r 5a03a9eab24e lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Apr 30 21:10:05 2004 +0000
+++ b/lisp/ChangeLog	Fri Apr 30 21:12:42 2004 +0000
@@ -1,3 +1,7 @@
+2004-04-30  Juanma Barranquero  <lektu@terra.es>
+
+	* smerge-mode.el (smerge-diff-switches): Fix typo in docstring.
+
 2004-04-30  Mario Lang  <mlang@delysid.org>
 
 	* diff.el (diff-switches): Fix typo in docstring.