diff options
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))) |