Mercurial > emacs

comparison 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
comparison
equal deleted inserted replaced
66686:ca587da00ba1 66687:26faad662ac6
1 2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
2
3 * ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not
4 merging.
5
6 * ediff-util.el (ediff-previous-difference): don't skip regions that
7 have merge clashes.
8
1 2005-11-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 9 2005-11-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 10
3 * mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Undo 11 * mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Undo
4 previous change. 12 previous change.
5 13