Represents a conflict displayed in a diff view.
Represents the summary displayed when comparing two versions of a document.
Represents the pane that displays the differences between two versions of an entity (e.g.
The available decisions to solve the conflict.
Copyright © 2004–2022 XWiki. All rights reserved.