Manage the decisions taken to solve the merge conflicts.
Provides general merge utility methods.
Store information about a merge operation of documents.
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.
Represents the different parts of a document that are merged.
Copyright © 2004–2019 XWiki. All rights reserved.