]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 51f47f6) | patch
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
authorMichael Kifer <kifer@cs.stonybrook.edu>
Fri, 4 Nov 2005 05:40:03 +0000 (05:40 +0000)
committerMichael Kifer <kifer@cs.stonybrook.edu>
Fri, 4 Nov 2005 05:40:03 +0000 (05:40 +0000)
commit39bcfe5f466c009125c81e609ca7b68ec60295f8
treeecb738e2a89bb870beac93140ed046be907f6210tree | snapshot
parent51f47f643cb19decdd63e268b51f9b7fde40faa2commit | diff
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.
lisp/ChangeLog diff | blob | history
lisp/ediff-merg.el diff | blob | history
lisp/ediff-util.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.