Note
Access to this page requires authorization. You can try signing in or changing directories.
Access to this page requires authorization. You can try changing directories.
Conflict is being resolved in a merge tool.
Namespace: Microsoft.TeamFoundation.VersionControl.Controls
Assembly: Microsoft.TeamFoundation.VersionControl.Controls (in Microsoft.TeamFoundation.VersionControl.Controls.dll)
Syntax
'Declaration
Public Const ControlResolveConflictsConflictIsBeingManuallyMerged As String
public const string ControlResolveConflictsConflictIsBeingManuallyMerged
public:
literal String^ ControlResolveConflictsConflictIsBeingManuallyMerged
static val mutable ControlResolveConflictsConflictIsBeingManuallyMerged: string
public const var ControlResolveConflictsConflictIsBeingManuallyMerged : String
.NET Framework Security
- 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.