MergeManagerResult<String,Character> |
MergeManager.mergeCharacters(String previousStr,
String newStr,
String currentStr,
MergeConfiguration configuration) |
Perform a 3-way merge between the given strings by first splitting them into arrays of characters.
|
MergeDocumentResult |
MergeManager.mergeDocument(DocumentModelBridge previousDoc,
DocumentModelBridge nextDoc,
DocumentModelBridge currentDoc,
MergeConfiguration mergeConfiguration) |
Perform a 3-way merge between documents.
|
MergeManagerResult<String,String> |
MergeManager.mergeLines(String previousStr,
String newStr,
String currentStr,
MergeConfiguration configuration) |
Perform a 3-way merge between the given strings by first splitting them into lines.
|
<T> MergeManagerResult<List<T>,T> |
MergeManager.mergeList(List<T> commonAncestor,
List<T> next,
List<T> current,
MergeConfiguration configuration) |
Perform a 3-way merge between the list of elements.
|
<T> MergeManagerResult<T,T> |
MergeManager.mergeObject(T previousObject,
T newObject,
T currentObject,
MergeConfiguration configuration) |
Perform a 3-way merge between the given objects.
|