[Emacs-diffs] Changes to emacs/lisp/ChangeLog

[Michael Kifer]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.8519 emacs/lisp/ChangeLog:1.8520
*** emacs/lisp/ChangeLog:1.8519 Fri Nov  4 05:37:09 2005
--- emacs/lisp/ChangeLog        Fri Nov  4 05:40:03 2005
***************
*** 1,3 ****
--- 1,11 ----
+ 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.
+       
  2005-11-04  YAMAMOTO Mitsuharu  <address@hidden>
  
        * mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Undo