Function: emerge-revisions-with-ancestor

emerge-revisions-with-ancestor is an autoloaded, interactive and byte-compiled function defined in emerge.el.gz.

Signature

(emerge-revisions-with-ancestor ARG FILE REVISION-A REVISION-B ANCESTOR &optional STARTUP-HOOKS QUIT-HOOKS)

Documentation

Emerge two RCS revisions of a file, with another revision as ancestor.

Key Bindings

Source Code

;; Defined in /usr/src/emacs/lisp/vc/emerge.el.gz
;;;###autoload
(defun emerge-revisions-with-ancestor (arg file revision-A
                                       revision-B ancestor
                                       &optional
                                       startup-hooks quit-hooks)
  "Emerge two RCS revisions of a file, with another revision as ancestor."
  (interactive
   (list current-prefix-arg
	 (read-file-name "File to merge: " nil nil 'confirm)
	 (read-string "Revision A to merge: " emerge-last-revision-A)
	 (read-string "Revision B to merge: " emerge-last-revision-B)
	 (read-string "Ancestor: " emerge-last-revision-ancestor)))
  (setq emerge-last-revision-A revision-A
	emerge-last-revision-B revision-B
	emerge-last-revision-ancestor ancestor)
  (emerge-revision-with-ancestor-internal
   file revision-A revision-B ancestor startup-hooks
   (if arg
       (let ((cmd (format "%s %s" emerge-rcs-ci-program file)))
	 (cons (lambda () (shell-command cmd))
	       quit-hooks))
     quit-hooks)))