Поделиться через


GuiResources.ControlResolveConflictsNoConflictResolvedContentNotMergeable Field

Sorry, we were unable to merge the conflicting content changes and using the configured merge tool is not supported for this conflict.

Namespace:  Microsoft.TeamFoundation.VersionControl.Controls
Assembly:  Microsoft.TeamFoundation.VersionControl.Controls (in Microsoft.TeamFoundation.VersionControl.Controls.dll)

Syntax

'Declaration
Public Const ControlResolveConflictsNoConflictResolvedContentNotMergeable As String
public const string ControlResolveConflictsNoConflictResolvedContentNotMergeable
public:
literal String^ ControlResolveConflictsNoConflictResolvedContentNotMergeable
static val mutable ControlResolveConflictsNoConflictResolvedContentNotMergeable: string
public const var ControlResolveConflictsNoConflictResolvedContentNotMergeable : String

.NET Framework Security

See Also

Reference

GuiResources Class

Microsoft.TeamFoundation.VersionControl.Controls Namespace