The P4ClientMerge type exposes the following members.
Constructors
| Name | Description | |
|---|---|---|
|
|
P4ClientMerge |
Initializes a new instance of the P4ClientMerge class
|
Methods
| Name | Description | |
|---|---|---|
|
|
AutoResolve | |
|
|
DetectResolve | |
|
|
Equals | (Inherited from Object.) |
|
|
Finalize |
Allows an Object to attempt to free resources and perform other cleanup operations before the Object is reclaimed by garbage collection. (Inherited from Object.) |
|
|
GetBaseFile | |
|
|
GetBothChunks | |
|
|
GetConflictChunks | |
|
|
GetHashCode |
Serves as a hash function for a particular type. (Inherited from Object.) |
|
|
GetLastError | |
|
|
GetMergeDigest | |
|
|
GetResultFile | |
|
|
GetTheirChunks | |
|
|
GetTheirDigest | |
|
|
GetTheirFile | |
|
|
GetType |
Gets the Type of the current instance. (Inherited from Object.) |
|
|
GetYourChunks | |
|
|
GetYourDigest | |
|
|
GetYourFile | |
|
|
IsAcceptable | |
|
|
MemberwiseClone |
Creates a shallow copy of the current Object. (Inherited from Object.) |
|
|
Resolve | |
|
|
ToString | (Inherited from Object.) |