public class

TDMMerger

extends Object
implements Merger
java.lang.Object
   ↳ com.atlassian.confluence.plugins.merge.TDMMerger

Summary

Public Constructors
TDMMerger(XmlEventReaderFactory xmlEventReaderFactory, XMLOutputFactory xmlOutputFactory)
Public Methods
MergeResult mergeContent(String base, String left, String right)
Merge the content provided.
[Expand]
Inherited Methods
From class java.lang.Object
From interface com.atlassian.confluence.util.diffs.Merger

Public Constructors

public TDMMerger (XmlEventReaderFactory xmlEventReaderFactory, XMLOutputFactory xmlOutputFactory)

Public Methods

public MergeResult mergeContent (String base, String left, String right)

Merge the content provided.

Parameters
base common base for left and right strings.
left branch 1 to merge in
right branch 2 to merge in.
Returns
  • the result of the merge. Note that implementations should never return null. If the merge failed the returned mergeresult should contain this information.