ThreeWayMerge Class
Contains the methods to perform a three-way merge.
Inheritance Hierarchy
System.Object
Microsoft.TeamFoundation.VersionControl.Client.ThreeWayMerge
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
Syntax
'宣言
Public Class ThreeWayMerge
public class ThreeWayMerge
public ref class ThreeWayMerge
type ThreeWayMerge = class end
public class ThreeWayMerge
The ThreeWayMerge type exposes the following members.
Constructors
Name | Description | |
---|---|---|
![]() |
ThreeWayMerge | Initializes a new ThreeWayMerge instance. |
Top
Properties
Name | Description | |
---|---|---|
![]() |
ContentMergeSummary | Gets the content merge summary. |
![]() |
IntermediateMergeEncoding | Gets or sets the intermediate merge encoding. |
![]() |
IsBaseless | Gets or sets a flag that describes whether the merge is baseless. |
![]() |
LatestFileEncoding | Gets or sets the latest file encoding. |
![]() |
LatestFileLabel | Gets or sets the latest file label. |
![]() |
LatestFileName | Gets or sets the latest file name. |
![]() |
MergedFileEncoding | Gets or sets the merged file encoding. |
![]() |
MergedFileLabel | Gets or sets the merged file label. |
![]() |
MergedFileName | Gets or sets the merged file name. |
![]() |
ModifiedFileEncoding | Gets or sets the modified file encoding. |
![]() |
ModifiedFileLabel | Gets or sets the modified file label. |
![]() |
ModifiedFileName | Gets or sets the modified file name. |
![]() |
OriginalFileEncoding | Gets or sets the original file encoding. |
![]() |
OriginalFileLabel | Gets or sets the original file label. |
![]() |
OriginalFileName | Gets or sets the original file name. |
![]() |
UseExternalMergeTool | Gets or sets a flag that describes whether to use an external merge tool. |
Top
Methods
Name | Description | |
---|---|---|
![]() |
Equals | Determines whether the specified Object is equal to the current Object. (Inherited from Object.) |
![]() |
Finalize | Allows an object to try to free resources and perform other cleanup operations before it is reclaimed by garbage collection. (Inherited from Object.) |
![]() |
GetHashCode | Serves as a hash function for a particular type. (Inherited from Object.) |
![]() |
GetType | Gets the Type of the current instance. (Inherited from Object.) |
![]() |
MemberwiseClone | Creates a shallow copy of the current Object. (Inherited from Object.) |
![]() |
Run | Executes a three-way merge. |
![]() |
ToString | Returns a string that represents the current object. (Inherited from Object.) |
Top
Thread Safety
Any public static (Shared in Visual Basic) members of this type are thread safe. Any instance members are not guaranteed to be thread safe.