Function: emerge-revisions

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

Signature

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

Documentation

Emerge two RCS revisions of a file.

Key Bindings

Source Code

;; Defined in /usr/src/emacs/lisp/vc/emerge.el.gz
;;; Functions to start Emerge on RCS versions

;;;###autoload
(defun emerge-revisions (arg file revision-A revision-B
			 &optional startup-hooks quit-hooks)
  "Emerge two RCS revisions of a file."
  (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)))
  (setq emerge-last-revision-A revision-A
	emerge-last-revision-B revision-B)
  (emerge-revisions-internal
   file revision-A revision-B startup-hooks
   (if arg
       (let ((cmd (format "%s %s" emerge-rcs-ci-program file)))
         (cons (lambda () (shell-command cmd))
	       quit-hooks))
       quit-hooks)))