Package ro.sync.merge

Class Summary

Class	Description
MergeResult	Defines the result of a three way merge.

Enum Summary

Enum	Description
MergeConflictResolutionMethods	Possible methods of dealing with conflicts when auto-merging files.
MergeResult.ResultType	The way a merge has finalized.