Mercurial > emacs

diff lisp/ChangeLog @ 108733:46ac70591556

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* smerge-mode.el: Fix typos.
author Juanma Barranquero <lekktu@gmail.com>
date Fri, 21 May 2010 03:05:50 +0200
parents 66c9aef964cc
children fc613fd476ff
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu May 20 17:55:17 2010 -0700
+++ b/lisp/ChangeLog	Fri May 21 03:05:50 2010 +0200
@@ -1,3 +1,10 @@
+2010-05-21  Juanma Barranquero  <lekktu@gmail.com>
+
+	* smerge-mode.el (smerge-refine-ignore-whitespace)
+	(smerge-refine-weight-hack, smerge-refine, smerge-makeup-conflict):
+	Fix typos in docstrings.
+	(smerge-resolve, smerge-refine-subst): Reflow docstrings.
+
 2010-05-21  Glenn Morris  <rgm@gnu.org>
 
 	* loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer