|
| From: | Stefan Monnier |
| Subject: | [Emacs-commit] emacs/lisp smerge-mode.el ChangeLog |
| Date: | Mon, 31 Mar 2008 01:49:59 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/03/31 01:49:59
Modified files:
lisp : smerge-mode.el ChangeLog
Log message:
(smerge-refine): Allow highlighting other subparts in 3-way conflicts.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.13254&r2=1.13255
| [Prev in Thread] | Current Thread | [Next in Thread] |