104 |
(make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default) |
(make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default) |
105 |
|
|
106 |
;; check if there is no clash between the ancestor and one of the variants. |
;; check if there is no clash between the ancestor and one of the variants. |
107 |
|
;; if it is not a merge job then return true |
108 |
(defsubst ediff-merge-region-is-non-clash (n) |
(defsubst ediff-merge-region-is-non-clash (n) |
109 |
(string-match "prefer" (or (ediff-get-state-of-merge n) ""))) |
(if (ediff-merge-job) |
110 |
|
(string-match "prefer" (or (ediff-get-state-of-merge n) "")) |
111 |
|
t)) |
112 |
|
|
113 |
;; If ediff-show-clashes-only, check if there is no clash between the ancestor |
;; If ediff-show-clashes-only, check if there is no clash between the ancestor |
114 |
;; and one of the variants. |
;; and one of the variants. |