|
From: | Stefan Monnier |
Subject: | [Emacs-commit] emacs/lisp smerge-mode.el ChangeLog |
Date: | Tue, 15 Jan 2008 21:40:12 +0000 |
CVSROOT: /sources/emacs Module name: emacs Changes by: Stefan Monnier <monnier> 08/01/15 21:40:11 Modified files: lisp : smerge-mode.el ChangeLog Log message: (smerge-refine): Also work on "same change conflicts". (smerge-makeup-conflict): New command. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&r1=1.60&r2=1.61 http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.12577&r2=1.12578
[Prev in Thread] | Current Thread | [Next in Thread] |