Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-merg.el @ 197:acd284d43ca1 r20-3b25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b25
author cvs
date Mon, 13 Aug 2007 10:00:02 +0200
parents bfd6434d15b3
children
comparison
equal deleted inserted replaced
196:58e0786448ca 197:acd284d43ca1
78 78
79 (ediff-defvar-local ediff-show-clashes-only nil 79 (ediff-defvar-local ediff-show-clashes-only nil
80 "*If t, show only those diff regions where both buffers disagree with the ancestor. 80 "*If t, show only those diff regions where both buffers disagree with the ancestor.
81 This means that regions that have status prefer-A or prefer-B will be 81 This means that regions that have status prefer-A or prefer-B will be
82 skiped over. Nil means show all regions.") 82 skiped over. Nil means show all regions.")
83
84 ;; If ediff-show-clashes-only, check if there is no clash between the ancestor
85 ;; and one of the variants.
86 (defsubst ediff-merge-region-is-non-clash (n)
87 (and ediff-show-clashes-only
88 (string-match "prefer" (or (ediff-get-state-of-merge n) ""))))
83 89
84 90
85 (defsubst ediff-get-combined-region (n) 91 (defsubst ediff-get-combined-region (n)
86 (concat (nth 0 ediff-combination-pattern) "\n" 92 (concat (nth 0 ediff-combination-pattern) "\n"
87 (ediff-get-region-contents n 'A ediff-control-buffer) 93 (ediff-get-region-contents n 'A ediff-control-buffer)