Function: cvs-ediff-merge

cvs-ediff-merge is a byte-compiled function defined in pcvs.el.gz.

Signature

(cvs-ediff-merge B1 B2 BASE OUT)

Source Code

;; Defined in /usr/src/emacs/lisp/vc/pcvs.el.gz
(defun cvs-ediff-merge (b1 b2 base out)
  (let ((ediff-after-quit-destination-buffer (current-buffer))
	(startup-hook '(cvs-ediff-startup-hook)))
    (ediff-merge-buffers-with-ancestor
     b1 b2 base startup-hook
     'ediff-merge-revisions-with-ancestor
     out)))