Uses of Interface
org.xwiki.diff.Conflict

Uses of Conflict in org.xwiki.diff

Methods in org.xwiki.diff that return Conflict

Modifier and Type	Method	Description
Conflict<E>	ConflictDecision.getConflict()

Methods in org.xwiki.diff that return types with arguments of type Conflict

Modifier and Type	Method	Description
default List<Conflict<E>>	MergeResult.getConflicts()