Package com.xpn.xwiki.doc.merge

package com.xpn.xwiki.doc.merge

Class	Description
CollisionException	Any exception raised when facing a collision during a 3 ways merge.
MergeConfiguration	Allow to define some behaviors of the merge.
MergeConfiguration.ConflictFallbackVersion	Versions to use as fallback in case of conflicts.
MergeException	Any exception raised during a merge.
MergeResult	Deprecated. Since 11.8RC1, prefer using MergeManagerResult.