|
|||||||||
| PREV NEXT | FRAMES NO FRAMES | ||||||||
| Uses of MergeResult in org.xwiki.diff |
|---|
| Methods in org.xwiki.diff that return MergeResult | ||
|---|---|---|
|
DiffManager.merge(List<E> commonAncestor,
List<E> next,
List<E> current,
MergeConfiguration<E> configuration)
Execute a 3-way merge on provided versions. |
|
|
|||||||||
| PREV NEXT | FRAMES NO FRAMES | ||||||||