Package ro.sync.merge

package ro.sync.merge

Class	Description
MergeConflictResolutionMethods	Possible methods of dealing with conflicts when auto-merging files.
MergeResult	Defines the result of a three way merge.
MergeResult.ResultType	The way a merge has finalized.