diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-11-04 05:40:03 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-11-04 05:40:03 +0000 |
| commit | 39bcfe5f466c009125c81e609ca7b68ec60295f8 (patch) | |
| tree | ecb738e2a89bb870beac93140ed046be907f6210 /lisp/emacs-lisp | |
| parent | 51f47f643cb19decdd63e268b51f9b7fde40faa2 (diff) | |
| download | emacs-39bcfe5f466c009125c81e609ca7b68ec60295f8.tar.gz emacs-39bcfe5f466c009125c81e609ca7b68ec60295f8.tar.bz2 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/emacs-lisp')
0 files changed, 0 insertions, 0 deletions