P4ClientMerge Class |
Namespace: Perforce.P4
The P4ClientMerge type exposes the following members.
Name | Description | |
---|---|---|
![]() | P4ClientMerge |
P4ClientMerge Constructor
|
Name | Description | |
---|---|---|
![]() | AutoResolve |
AutoResolve
|
![]() | DetectResolve |
Detect if a resolve has been done
|
![]() | Equals | (Inherited from Object.) |
![]() | Finalize | (Inherited from Object.) |
![]() | GetBaseFile |
GetBaseFile name
|
![]() | GetBothChunks |
GetBothChunks
|
![]() | GetConflictChunks |
GetConflictChunks
|
![]() | GetHashCode | (Inherited from Object.) |
![]() | GetLastError |
GetLastError
|
![]() | GetMergeDigest |
GetMergeDigest
|
![]() | GetResultFile |
GetResultFile name
|
![]() | GetTheirChunks |
GetTheirChunks
|
![]() | GetTheirDigest |
GetTheirDigest
|
![]() | GetTheirFile |
GetTheirFile name
|
![]() | GetType | (Inherited from Object.) |
![]() | GetYourChunks |
GetYourChunks
|
![]() | GetYourDigest |
GetYourDigest
|
![]() | GetYourFile |
GetYourFile name
|
![]() | IsAcceptable |
Check that the merge is acceptable
|
![]() | MemberwiseClone | (Inherited from Object.) |
![]() | Resolve |
Do a resolve
|
![]() | ToString | (Inherited from Object.) |