Function: emerge-combine-versions-register

emerge-combine-versions-register is an interactive and byte-compiled function defined in emerge.el.gz.

Signature

(emerge-combine-versions-register CHAR &optional FORCE)

Documentation

Combine the two versions using the template in register REG.

See documentation of the variable emerge-combine-versions-template for how the template is interpreted. Refuses to function if this difference has been edited, i.e., if it is neither the A nor the B variant.

With prefix argument CHAR, force the variant to be selected even if the difference has been edited.

Interactively, reads the register using register-read-with-preview.

Key Bindings

Source Code

;; Defined in /usr/src/emacs/lisp/vc/emerge.el.gz
(defun emerge-combine-versions-register (char &optional force)
  "Combine the two versions using the template in register REG.
See documentation of the variable `emerge-combine-versions-template'
for how the template is interpreted.
Refuses to function if this difference has been edited, i.e., if it is
neither the A nor the B variant.

With prefix argument CHAR, force the variant to be selected even
if the difference has been edited.

Interactively, reads the register using `register-read-with-preview'."
  (interactive (list
		(register-read-with-preview "Register containing template: ")
		current-prefix-arg))
  (let ((template (get-register char)))
    (if (not (stringp template))
	(error "Register does not contain text"))
    (emerge-combine-versions-internal template force)))