/[emacs]/emacs/lisp/ediff-merg.el
ViewVC logotype

Diff of /emacs/lisp/ediff-merg.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.27 by kifer, Thu Oct 6 00:09:49 2005 UTC revision 1.28 by kifer, Fri Nov 4 05:40:03 2005 UTC
# Line 104  Buffer B." Line 104  Buffer B."
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.

Legend:
Removed from v.1.27  
changed lines
  Added in v.1.28

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26