Variable: ediff-combination-pattern

ediff-combination-pattern is a customizable variable defined in ediff-merg.el.gz.

Value

("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor"
 Ancestor "======= end")

Documentation

Pattern to be used for combining difference regions in buffers A and B.

The value must be a list of the form
(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4)
where bufspec is the symbol A, B, or Ancestor. For instance, if the value is
(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the
combined text will look like this:

STRING1 diff region from variant A STRING2 diff region from the ancestor STRING3 diff region from variant B STRING4

Source Code

;; Defined in /usr/src/emacs/lisp/vc/ediff-merg.el.gz
(defcustom ediff-combination-pattern
  '("<<<<<<< variant A" A ">>>>>>> variant B" B  "####### Ancestor" Ancestor "======= end")
  "Pattern to be used for combining difference regions in buffers A and B.
The value must be a list of the form
\(STRING1 bufspec1  STRING2 bufspec2 STRING3 bufspec3 STRING4)
where bufspec is the symbol A, B, or Ancestor.  For instance, if the value is
`(STRING1 A  STRING2 Ancestor STRING3 B STRING4)' then the
combined text will look like this:

STRING1
diff region from variant A
STRING2
diff region from the ancestor
STRING3
diff region from variant B
STRING4"
  :type '(choice (list string symbol string symbol string)
		 (list string symbol string symbol string symbol string))
  :group 'ediff-merge)