Package com.xpn.xwiki.doc.merge

Class Summary

Class	Description
MergeConfiguration	Allow to define some behaviors of the merge.
MergeResult	Deprecated Since 11.8RC1, prefer using MergeManagerResult.

Exception Summary

Exception	Description
CollisionException	Any exception raised when facing a collision during a 3 ways merge.
MergeException	Any exception raised during a merge.