emacs-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-commit] emacs/lisp smerge-mode.el ChangeLog

From: Stefan Monnier
Subject: [Emacs-commit] emacs/lisp smerge-mode.el ChangeLog
Date: Mon, 31 Mar 2008 02:57:41 +0000 
CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/31 02:57:41

Modified files:
        lisp           : smerge-mode.el ChangeLog 

Log message:
        (smerge-apply-resolution-patch): New fun.
        (smerge-resolve): Add various resolution heuristics.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.13256&r2=1.13257
reply via email to
[Prev in Thread] Current Thread [Next in Thread]