[Emacs-commit] emacs/lisp ediff-util.el ediff-merg.el ChangeLog

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Michael Kifer <address@hidden>  05/11/04 05:40:04

Modified files:
        lisp           : ediff-util.el ediff-merg.el ChangeLog 

Log message:
        2005-11-04  Michael Kifer  <address@hidden>
        
        * ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not
        merging.
        
        * ediff-util.el (ediff-previous-difference): don't skip regions that
        have merge clashes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-util.el.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-merg.el.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ChangeLog.diff?tr1=1.8519&tr2=1.8520&r1=text&r2=text