Interface Merger

    • Method Detail

      • mergeContent

        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.