Uses of Class
com.microsoft.tfs.core.util.diffmerge.ThreeWayMerge

Packages that use ThreeWayMerge
com.microsoft.tfs.core.clients.versioncontrol.engines   
com.microsoft.tfs.core.util.diffmerge   
 

Uses of ThreeWayMerge in com.microsoft.tfs.core.clients.versioncontrol.engines
 

Methods in com.microsoft.tfs.core.clients.versioncontrol.engines with parameters of type ThreeWayMerge
 java.lang.String MergeEngine.beginCustomMerge(Conflict conflict, ThreeWayMerge threeWayMerge)
          Sets up a merge for the given conflict so that callers may perform a custom merge process, returning the merge output file that should be written to to complete the merge.
 com.microsoft.tfs.util.process.ProcessRunner MergeEngine.beginExternalMerge(Conflict conflict, ThreeWayMerge threeWayMerge, com.microsoft.tfs.util.process.ProcessFinishedHandler finishedHandler, java.io.OutputStream capturedStandardOutput, java.io.OutputStream capturedStandardError)
          Begins an external content merge for the given conflict.
 void MergeEngine.endCustomMerge(java.lang.String mergeFilename, Conflict conflict, ThreeWayMerge threeWayMerge, boolean success)
          Ends an custom content merge for the given conflict that was begun with MergeEngine.beginCustomMerge(Conflict, ThreeWayMerge).
 boolean MergeEngine.endExternalMerge(com.microsoft.tfs.util.process.ProcessRunner runner, Conflict conflict, ThreeWayMerge threeWayMerge)
          Ends an external content merge for the given conflict that was begun with MergeEngine.beginExternalMerge(Conflict, ThreeWayMerge, ProcessFinishedHandler, OutputStream, OutputStream) .
 

Uses of ThreeWayMerge in com.microsoft.tfs.core.util.diffmerge
 

Methods in com.microsoft.tfs.core.util.diffmerge with parameters of type ThreeWayMerge
static com.microsoft.tfs.util.process.ProcessRunner ExternalRunner.beginMerge(ThreeWayMerge twm, ExternalTool tool, com.microsoft.tfs.util.process.ProcessFinishedHandler finishedHandler, java.io.OutputStream capturedStandardOutput, java.io.OutputStream capturedStandardError)
          Runs an external merge tool to complete the given three way merge.
 



© 2015 Microsoft. All rights reserved.