Package org.xwiki.diff

Interface Summary

Interface	Description
Chunk<E>	A snippet of the source list.
Conflict<E>	Represent a conflict that happened during a merge operation.
ConflictDecision<E>	Represent a decision taken to solve a given Conflict.
Delta<E>	A delta between two version of a list.
DiffManager	Various diff/merge tools.
DiffResult<E>	The result of the execution of a diff on two lists.
MergeResult<E>
Patch<E>	A list of deltas between two versions.

Class Summary

Class	Description
DiffConfiguration<E>	Setup diff behavior.
MergeConfiguration<E>	Setup merge behavior.

Enum Summary

Enum	Description
ConflictDecision.DecisionType	The decision made for this conflict.
Delta.Type	The kind of modification to apply on the list.
MergeConfiguration.Version	One of the merged versions.

Exception Summary

Exception	Description
DiffException	Any exception raised when failing to create a diff.
MergeException	Any exception raised when failing to merge 3 lists.
PatchException	Any exception raised when failing to apply a patch.