Package org.xwiki.store.merge

Interface Summary

Interface	Description
MergeConflictDecisionsManager	Manage the decisions taken to solve the merge conflicts.
MergeManager	Provides general merge utility methods.

Class Summary

Class	Description
MergeDocumentResult	Store information about a merge operation of documents.
MergeManagerResult<R,C>	This represents the result of a merge operation: it contains both the result of the merge, the possible conflicts that happened during the merge, and the logs.

Enum Summary

Enum	Description
MergeDocumentResult.DocumentPart	Represents the different parts of a document that are merged.