Uses of Class
com.aragost.javahg.merge.ConflictResolvingContext

Packages that use ConflictResolvingContext

com.aragost.javahg.merge

Uses of ConflictResolvingContext in com.aragost.javahg.merge

Subclasses of ConflictResolvingContext in com.aragost.javahg.merge

class	BackoutConflictResolvingContext
class	GraftContext
class	MergeContext

Methods in com.aragost.javahg.merge that return ConflictResolvingContext

ConflictResolvingContext

MergeFile.getMergeCtx()

Constructors in com.aragost.javahg.merge with parameters of type ConflictResolvingContext

FlagConflict(ConflictResolvingContext mergeState, String file)

KeepDeleteConflict(ConflictResolvingContext mergeState, String fileName, KeepDeleteConflict.State localState)

MergeConflict(ConflictResolvingContext mergeState, String file)

MergeFile(ConflictResolvingContext mergeCtx, String file)