Uses of Class
org.xwiki.store.merge.MergeManagerResult

Packages that use MergeManagerResult

Package	Description
org.xwiki.store.merge

Uses of MergeManagerResult in org.xwiki.store.merge

Subclasses of MergeManagerResult in org.xwiki.store.merge

Modifier and Type	Class	Description
class	MergeDocumentResult	Store information about a merge operation of documents.

Methods in org.xwiki.store.merge that return MergeManagerResult

Modifier and Type	Method	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.

Methods in org.xwiki.store.merge with parameters of type MergeManagerResult

Modifier and Type	Method	Description
void	MergeDocumentResult.putMergeResult(MergeDocumentResult.DocumentPart documentPart, MergeManagerResult mergeManagerResult)	Stores the result of merging a part of the document.