[Emacs-diffs] Changes to emacs/lisp/ediff-merg.el

[Michael Kifer]

Index: emacs/lisp/ediff-merg.el
diff -c emacs/lisp/ediff-merg.el:1.27 emacs/lisp/ediff-merg.el:1.28
*** emacs/lisp/ediff-merg.el:1.27       Thu Oct  6 00:09:49 2005
--- emacs/lisp/ediff-merg.el    Fri Nov  4 05:40:03 2005
***************
*** 104,111 ****
  (make-variable-buffer-local 
'ediff-skip-merge-regions-that-differ-from-default)
  
  ;; check if there is no clash between the ancestor and one of the variants.
  (defsubst ediff-merge-region-is-non-clash (n)
!   (string-match "prefer" (or (ediff-get-state-of-merge n) "")))
  
  ;; If ediff-show-clashes-only, check if there is no clash between the ancestor
  ;; and one of the variants.
--- 104,114 ----
  (make-variable-buffer-local 
'ediff-skip-merge-regions-that-differ-from-default)
  
  ;; check if there is no clash between the ancestor and one of the variants.
+ ;; if it is not a merge job then return true
  (defsubst ediff-merge-region-is-non-clash (n)
!   (if (ediff-merge-job)
!       (string-match "prefer" (or (ediff-get-state-of-merge n) ""))
!     t))
  
  ;; If ediff-show-clashes-only, check if there is no clash between the ancestor
  ;; and one of the variants.