Uses of Class
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeCallback2.MergeOutcome
Packages that use SvnNgMergeCallback2.MergeOutcome
-
Uses of SvnNgMergeCallback2.MergeOutcome in org.tmatesoft.svn.core.internal.wc2.ng
Methods in org.tmatesoft.svn.core.internal.wc2.ng that return SvnNgMergeCallback2.MergeOutcomeModifier and TypeMethodDescriptionprivate SvnNgMergeCallback2.MergeOutcome
SvnNgMergeCallback2.merge
(java.io.File leftAbsPath, java.io.File rightAbsPath, java.io.File targetAbsPath, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean dryRun, java.lang.String diff3Cmd, SVNDiffOptions mergeOptions, SVNProperties originalProps, SVNProperties propChanges, boolean mergeContentNeeded, boolean mergePropsNeeded, ISVNConflictHandler conflictResolver)