The P4ClientMerge type exposes the following members.
Methods
Name | Description | |
---|---|---|
![]() |
AutoResolve |
AutoResolve
|
![]() |
DetectResolve |
Detect if a resolve has been done
|
![]() |
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 |
GetBaseFile name
|
![]() |
GetBothChunks |
GetBothChunks
|
![]() |
GetConflictChunks |
GetConflictChunks
|
![]() |
GetHashCode |
Serves as a hash function for a particular type. (Inherited from Object.) |
![]() |
GetLastError |
GetLastError
|
![]() |
GetMergeDigest |
GetMergeDigest
|
![]() |
GetResultFile |
GetResultFile name
|
![]() |
GetTheirChunks |
GetTheirChunks
|
![]() |
GetTheirDigest |
GetTheirDigest
|
![]() |
GetTheirFile |
GetTheirFile name
|
![]() |
GetType |
Gets the Type of the current instance. (Inherited from Object.) |
![]() |
GetYourChunks |
GetYourChunks
|
![]() |
GetYourDigest |
GetYourDigest
|
![]() |
GetYourFile |
GetYourFile name
|
![]() |
IsAcceptable |
Check that the merge is acceptable
|
![]() |
MemberwiseClone |
Creates a shallow copy of the current Object. (Inherited from Object.) |
![]() |
Resolve |
Do a resolve
|
![]() |
ToString | (Inherited from Object.) |