Variable: emerge-execute-line-deletions
emerge-execute-line-deletions is a customizable variable defined in
emerge.el.gz.
Value
nil
Documentation
If non-nil: emerge-execute-line makes no output if an input was deleted.
It concludes that an input version has been deleted when an ancestor entry is present, only one A or B entry is present, and an output entry is present. If nil: In such circumstances, the A or B file that is present will be copied to the designated output file.
Source Code
;; Defined in /usr/src/emacs/lisp/vc/emerge.el.gz
(defcustom emerge-execute-line-deletions nil
"If non-nil: `emerge-execute-line' makes no output if an input was deleted.
It concludes that an input version has been deleted when an ancestor entry
is present, only one A or B entry is present, and an output entry is present.
If nil: In such circumstances, the A or B file that is present will be
copied to the designated output file."
:type 'boolean)