Function: vc-rcs-merge

vc-rcs-merge is a byte-compiled function defined in vc-rcs.el.gz.

Signature

(vc-rcs-merge FILE FIRST-VERSION &optional SECOND-VERSION)

Documentation

Merge changes into current working copy of FILE.

The changes are between FIRST-VERSION and SECOND-VERSION.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/vc-rcs.el.gz
(defun vc-rcs-merge (file first-version &optional second-version)
  "Merge changes into current working copy of FILE.
The changes are between FIRST-VERSION and SECOND-VERSION."
  (vc-do-command "*vc*" 1 "rcsmerge" (vc-master-name file)
		 "-kk"			; ignore keyword conflicts
		 (concat "-r" first-version)
		 (if second-version (concat "-r" second-version))))