diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-09-30 01:13:53 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-09-30 01:13:53 +0000 |
| commit | 8e41a31c5d691dc844994f080ff21baa1863fcde (patch) | |
| tree | f1874e1eeb0ad6235de22f60ca1eba2c700e07aa /lisp/ediff-merg.el | |
| parent | 991667f86e871f9fbae87cc696de53778a1775c0 (diff) | |
| download | emacs-8e41a31c5d691dc844994f080ff21baa1863fcde.tar.gz | |
new version
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 142d9fc9ac2..f77d17ea7d5 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -81,6 +81,12 @@ STRING3 This means that regions that have status prefer-A or prefer-B will be skiped over. Nil means show all regions.") +;; If ediff-show-clashes-only, check if there is no clash between the ancestor +;; and one of the variants. +(defsubst ediff-merge-region-is-non-clash (n) + (and ediff-show-clashes-only + (string-match "prefer" (or (ediff-get-state-of-merge n) "")))) + (defsubst ediff-get-combined-region (n) (concat (nth 0 ediff-combination-pattern) "\n" |