Uses of Interface
org.xwiki.diff.ConflictDecision

Uses of ConflictDecision in org.xwiki.diff

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

Modifier and Type	Method	Description
List<ConflictDecision<E>>	MergeConfiguration.getConflictDecisionList()

Method parameters in org.xwiki.diff with type arguments of type ConflictDecision

Modifier and Type	Method	Description
void	MergeConfiguration.setConflictDecisionList(List<ConflictDecision<E>> conflictDecisionList)	Set the list of conflict decision to be taken.

Constructor parameters in org.xwiki.diff with type arguments of type ConflictDecision

Constructor	Description
MergeConfiguration(List<ConflictDecision<E>> conflictDecisions)	Create a merge configuration with the given list of decisions and a fallback to current version by default.
MergeConfiguration(MergeConfiguration.Version version, List<ConflictDecision<E>> conflictDecisions)	Crate a merge configuration with the given fallback version and the given conflict decisions to be taken.