com.atlassian.confluence.util.diffs
Interface Merger

All Known Implementing Classes:
PageLayoutAwareMerger, TDMMerger

public interface Merger


Method Summary
 MergeResult mergeContent(java.lang.String base, java.lang.String left, java.lang.String right)
          Merge the content provided.
 

Method Detail

mergeContent

MergeResult mergeContent(java.lang.String base,
                         java.lang.String left,
                         java.lang.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.


Copyright © 2003-2014 Atlassian. All Rights Reserved.