Function: emerge-combine-versions

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

Signature

(emerge-combine-versions &optional FORCE)

Documentation

Combine versions using the template in emerge-combine-versions-template.

Refuses to function if this difference has been edited, i.e., if it is neither the A nor the B variant.

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

Key Bindings

Source Code

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

With prefix argument FORCE, force the variant to be selected even
if the difference has been edited."
  (interactive "P")
  (emerge-combine-versions-internal emerge-combine-versions-template force))