Mercurial > emacs
comparison lisp/ChangeLog @ 108733:46ac70591556
* smerge-mode.el: Fix typos.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Fri, 21 May 2010 03:05:50 +0200 |
parents | 66c9aef964cc |
children | fc613fd476ff |
comparison
equal
deleted
inserted
replaced
108732:7e7c06acebf4 | 108733:46ac70591556 |
---|---|
1 2010-05-21 Juanma Barranquero <lekktu@gmail.com> | |
2 | |
3 * smerge-mode.el (smerge-refine-ignore-whitespace) | |
4 (smerge-refine-weight-hack, smerge-refine, smerge-makeup-conflict): | |
5 Fix typos in docstrings. | |
6 (smerge-resolve, smerge-refine-subst): Reflow docstrings. | |
7 | |
1 2010-05-21 Glenn Morris <rgm@gnu.org> | 8 2010-05-21 Glenn Morris <rgm@gnu.org> |
2 | 9 |
3 * loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer | 10 * loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer |
4 having a relative path in src/Makefile.in. | 11 having a relative path in src/Makefile.in. |
5 | 12 |