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
'Declaration
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 | |
|---|---|---|
.gif "Public method") |
ThreeWayMerge | Initializes a new ThreeWayMerge instance. |
Top
Properties
| Name | Description | |
|---|---|---|
.gif "Public property") |
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. |
|
LatestFileLabelFile | Gets or sets the latest label file label. |
|
LatestFileLabelTag | Gets or sets the latest label file tag. |
|
LatestFileName | Gets or sets the latest file name. |
|
LatestFileSpec | The file spec of the latest file |
|
MergedFileEncoding | Gets or sets the merged file encoding. |
|
MergedFileLabel | Gets or sets the merged file label. |
|
MergedFileLabelFile | Gets or sets the merged file label file. |
|
MergedFileLabelTag | Gets or sets the merged file label tag. |
|
MergedFileName | Gets or sets the merged file name. |
|
ModifiedFileEncoding | Gets or sets the modified file encoding. |
|
ModifiedFileLabel | Gets or sets the modified file label. |
|
ModifiedFileLabelFile | Gets or sets the modified file label file. |
|
ModifiedFileLabelTag | Gets or sets the modified file label tag. |
|
ModifiedFileName | Gets or sets the modified file name. |
|
ModifiedFileSpec | The file spec of the modified file |
|
OriginalFileEncoding | Gets or sets the original file encoding. |
|
OriginalFileLabel | Gets or sets the original file label. |
|
OriginalFileLabelFile | Gets or sets the original file label file. |
|
OriginalFileLabelTag | Gets or sets the original file label tag. |
|
OriginalFileName | Gets or sets the original file name. |
|
PreferredMergedFileEncoding | Gets or sets the preferred merged file encoding. |
|
UseExternalAutomergeTool | Gets or sets whether the merge uses an external automerge tool. |
|
UseExternalMergeTool | Gets or sets a flag that describes whether to use an external merge tool. |
|
VersionControlServerGuid | The version control server guid |
Top
Methods
| Name | Description | |
|---|---|---|
|
Equals | Determines whether the specified object is equal to the current object. (Inherited from Object.) |
.gif "Protected method") |
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. |
|
Run(array<IMergeChange[]%, Boolean, Boolean, Boolean, Boolean) | 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.