Uses of Class
org.tmatesoft.svn.core.internal.wc17.SVNWCContext.TextConflictResolutionInfo

Packages that use SVNWCContext.TextConflictResolutionInfo

Package	Description
org.tmatesoft.svn.core.internal.wc17

Uses of SVNWCContext.TextConflictResolutionInfo in org.tmatesoft.svn.core.internal.wc17

Methods in org.tmatesoft.svn.core.internal.wc17 that return SVNWCContext.TextConflictResolutionInfo

Modifier and Type	Method and Description
private SVNWCContext.TextConflictResolutionInfo	SVNWCContext.evalTextConflictFuncResult(java.io.File localAbsPath, SVNConflictChoice choice, java.io.File leftAbsPath, java.io.File rightAbsPath, java.io.File mergedAbsPath, java.io.File detranslatedTarget)
SVNWCContext.TextConflictResolutionInfo	SVNWCContext.resolveTextConflict(java.io.File localAbsPath, SVNOperation operation, java.io.File leftAbsPath, java.io.File rightAbsPath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, java.io.File resultTarget, java.io.File detranslatedTarget, ISVNConflictHandler conflictHandler)