From 39bcfe5f466c009125c81e609ca7b68ec60295f8 Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Fri, 4 Nov 2005 05:40:03 +0000 Subject: 2005-11-04 Michael Kifer * 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/ediff-util.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/ediff-util.el') 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))) -- cgit v1.2.1