org.xwiki.diff

Interface MergeResult<E>

Type Parameters:

E - the type of compared elements

public interface MergeResult<E>

Version:

$Id: 581d1542491a6630403088ae1bc03d32a1f70249 $

Method Summary

Methods

Modifier and Type	Method and Description
List<E>	getCommonAncestor()
List<E>	getCurrent()
LogQueue	getLog()
List<E>	getMerged()
List<E>	getNext()

Method Detail

getCommonAncestor

List<E> getCommonAncestor()

Returns:

the common ancestor

getNext

List<E> getNext()

Returns:

the new version

getCurrent

List<E> getCurrent()

Returns:

the current version

getLog

LogQueue getLog()

Returns:

the log of what append during the merge execution

getMerged

List<E> getMerged()

Returns:

the result of the 3 ways merge