This documentation is archived and is not being maintained.
Workspace::MergeContent Method
Visual Studio 2013
Merges content based on the requested conflict.
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
Parameters
- conflict
- Type: Microsoft.TeamFoundation.VersionControl.Client::Conflict
Conflict for which to merge content.
- useExternalMergeTool
- Type: System::Boolean
True to use a registered external merge tool; otherwise, false.
- Full trust for the immediate caller. This member cannot be used by partially trusted code. For more information, see Using Libraries from Partially Trusted Code.
Show: