Package org.xwiki.store.merge

package org.xwiki.store.merge

Class	Description
MergeConflictDecisionsManager	Manage the decisions taken to solve the merge conflicts.
MergeDocumentResult	Store information about a merge operation of documents.
MergeDocumentResult.DocumentPart	Represents the different parts of a document that are merged.
MergeManager	Provides general merge utility methods.
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.