Mercurial > emacs
diff lisp/ediff-util.el @ 66687:26faad662ac6
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 | d64aeb0dc54e |
| children | 0b958d61a229 |
line wrap: on
line diff
--- a/lisp/ediff-util.el Fri Nov 04 05:37:09 2005 +0000 +++ b/lisp/ediff-util.el Fri Nov 04 05:40:03 2005 +0000 @@ -1794,6 +1794,7 @@ skip-changed ;; skip difference regions that differ in white space (and ediff-ignore-similar-regions + (ediff-merge-region-is-non-clash n) (or (eq (ediff-no-fine-diffs-p n) t) (and (ediff-merge-job) (eq (ediff-no-fine-diffs-p n) 'C)))