com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions
Interfaces 
ConflictResolutionStatusListener
Classes 
AutomergeWritableConflictResolution
ConflictResolution
ConflictResolutionHelper
ConflictResolutionOptions
ConflictResolutionStatus
CoreConflictResolution
ExternalConflictResolution
ExternalConflictResolution.ExternalConflictResolver
KeepLocalWritableConflictResolution