|
| From: | Stefan Monnier |
| Subject: | [Emacs-commit] emacs/lisp smerge-mode.el ChangeLog |
| Date: | Fri, 11 Apr 2008 01:10:45 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/04/11 01:10:45
Modified files:
lisp : smerge-mode.el ChangeLog
Log message:
(smerge-apply-resolution-patch): Fix typo.
(smerge-resolve): Merge the "2-way refinement" case with one half of
the "mere whitespace" resolution.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.13414&r2=1.13415
| [Prev in Thread] | Current Thread | [Next in Thread] |