diff options
| author | Michael Kifer | 2005-11-04 05:40:03 +0000 |
|---|---|---|
| committer | Michael Kifer | 2005-11-04 05:40:03 +0000 |
| commit | 39bcfe5f466c009125c81e609ca7b68ec60295f8 (patch) | |
| tree | ecb738e2a89bb870beac93140ed046be907f6210 /lisp/ChangeLog | |
| parent | 51f47f643cb19decdd63e268b51f9b7fde40faa2 (diff) | |
| download | emacs-39bcfe5f466c009125c81e609ca7b68ec60295f8.tar.gz emacs-39bcfe5f466c009125c81e609ca7b68ec60295f8.zip | |
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.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 84f90e1ce5a..fad5fa8b322 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 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 |