emacs-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-commit] emacs/lisp add-log.el ChangeLog


From: Stefan Monnier
Subject: [Emacs-commit] emacs/lisp add-log.el ChangeLog
Date: Fri, 20 Jul 2007 20:41:59 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/07/20 20:41:59

Modified files:
        lisp           : add-log.el ChangeLog 

Log message:
        (change-log-resolve-conflict): Don't lose data if the merge fails.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/add-log.el?cvsroot=emacs&r1=1.189&r2=1.190
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.11409&r2=1.11410




reply via email to

[Prev in Thread] Current Thread [Next in Thread]