Show
Ignore:
Timestamp:
11/26/05 08:33:26 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • vendor/emacs-CVS_HEAD/lisp/ediff-merg.el

    r3939 r3988  
    105105 
    106106;; 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 
    107108(defsubst ediff-merge-region-is-non-clash (n) 
    108   (string-match "prefer" (or (ediff-get-state-of-merge n) ""))) 
     109  (if (ediff-merge-job) 
     110      (string-match "prefer" (or (ediff-get-state-of-merge n) "")) 
     111    t)) 
    109112 
    110113;; If ediff-show-clashes-only, check if there is no clash between the ancestor