Mercurial > emacs

diff lisp/ChangeLog @ 66687:26faad662ac6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu> * 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.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Fri, 04 Nov 2005 05:40:03 +0000
parents ca587da00ba1
children 73f037ab9b80
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Nov 04 05:37:09 2005 +0000
+++ b/lisp/ChangeLog	Fri Nov 04 05:40:03 2005 +0000
@@ -1,3 +1,11 @@
+2005-11-04  Michael Kifer  <kifer@cs.stonybrook.edu>
+	
+	* 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  <mituharu@math.s.chiba-u.ac.jp>
 
 	* mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Undo