Uses of Interface
org.xwiki.diff.MergeResult
-
-
Uses of MergeResult in org.xwiki.diff
Methods in org.xwiki.diff that return MergeResult Modifier and Type Method Description <E> MergeResult<E>
DiffManager. merge(List<E> commonAncestor, List<E> next, List<E> current, MergeConfiguration<E> configuration)
Execute a 3-way merge on provided versions.
-