This documentation is archived and is not being maintained.
ConflictsConflictType Enumeration
Visual Studio 2013
Namespace: Microsoft.TeamFoundation.Git.Controls.Extensibility
Assembly: Microsoft.TeamFoundation.Git.Controls (in Microsoft.TeamFoundation.Git.Controls.dll)
Show: