The properties of the MergeData class are listed below. For a complete list of MergeData class members, see the MergeData Members topic.
BaseFile | Base file for the 3-way merge. |
BaseName | Perforce name of the base file. Format is '//depot/path/file.ext#rev'. |
BothChunks | Returns the number of chunks that have the same change in both files. |
ConflictChunks | Returns the number of chunks that have conflicts. |
MergeDigest | Returns the MD5 checksum of WHAT?? file. |
MergeHint | Perforce's recommended merge action. |
ResultFile | File where merged result should be written. |
TheirChunks | Returns the number of chunks with changes in their file. |
TheirDigest | Returns the MD5 checksum of their file. |
TheirFile | Thier file for the 3-way merge. |
TheirName | Perforce name of their file. Format is '//depot/path/file.ext#rev'. |
YourChunks | Returns the number of chunks changed in your file. |
YourDigest | Returns the MD5 checksum of your file. |
YourFile | Your file for the 3-way merge. |
YourName | Perforce name of your file. Format is '//client/path/file.ext'. |
MergeData Class | P4API Namespace