Variable: emerge-combine-versions-template

emerge-combine-versions-template is a customizable variable defined in emerge.el.gz.

Value

"#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n"

Documentation

Template for emerge-combine-versions to combine the two versions.

The template is inserted as a string, with the following interpolations:
%a the A version of the difference
%b the B version of the difference
%% the character %
Don't forget to end the template with a newline. Note that this variable can be made local to a particular merge buffer by giving a prefix argument to emerge-set-combine-versions-template.

View in manual

Source Code

;; Defined in /usr/src/emacs/lisp/vc/emerge.el.gz
(defcustom emerge-combine-versions-template
  "#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n"
  "Template for `emerge-combine-versions' to combine the two versions.
The template is inserted as a string, with the following interpolations:
	%a	the A version of the difference
	%b	the B version of the difference
	%%	the character `%'
Don't forget to end the template with a newline.
Note that this variable can be made local to a particular merge buffer by
giving a prefix argument to `emerge-set-combine-versions-template'."
  :type 'string)