Package | Description |
---|---|
org.xwiki.store.merge |
Modifier and Type | Class and Description |
---|---|
class |
MergeDocumentResult
Store information about a merge operation of documents.
|
Modifier and Type | Method and Description |
---|---|
MergeManagerResult |
MergeDocumentResult.getMergeResult(MergeDocumentResult.DocumentPart documentPart) |
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.
|
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.
|
Modifier and Type | Method and Description |
---|---|
void |
MergeDocumentResult.putMergeResult(MergeDocumentResult.DocumentPart documentPart,
MergeManagerResult mergeManagerResult)
Stores the result of merging a part of the document.
|
Copyright © 2004–2019 XWiki. All rights reserved.