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 | 1d9e3f870c2a46cca9fd3d15b5fc130e946426ea (patch) | |
| tree | 8d21d44f6111d6b5a4e42235fcebd8f2878cfb94 /lisp/ediff-util.el | |
| parent | b5696bb55169b148a32c70b86057fc56f29a12f3 (diff) | |
| download | emacs-1d9e3f870c2a46cca9fd3d15b5fc130e946426ea.tar.gz | |
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/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 41f294c1b13..9db05ad143b 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -1794,6 +1794,7 @@ With a prefix argument, go back that many differences." 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))) |