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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/05/05 06:16:21

Modified files:
        lisp           : ChangeLog smerge-mode.el 

Log message:
        (smerge-start-session): Don't call smerge-next if
        looking at conflict marker.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.13662&r2=1.13663
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&r1=1.66&r2=1.67