![]() | Base file for the 3-way merge. |
![]() | Perforce name of the base file. Format is '//depot/path/file.ext#rev'. |
![]() | Returns the number of chunks that have the same change in both files. |
![]() | Returns the number of chunks that have conflicts. |
![]() | Returns the MD5 checksum of WHAT?? file. |
![]() | Perforce's recommended merge action. |
![]() | File where merged result should be written. |
![]() | Returns the number of chunks with changes in their file. |
![]() | Returns the MD5 checksum of their file. |
![]() | Thier file for the 3-way merge. |
![]() | Perforce name of their file. Format is '//depot/path/file.ext#rev'. |
![]() | Returns the number of chunks changed in your file. |
![]() | Returns the MD5 checksum of your file. |
![]() | Your file for the 3-way merge. |
![]() | Perforce name of your file. Format is '//client/path/file.ext'. |
![]() | Frees unmanaged memory. |
![]() | Determines whether the specified Object is equal to the current Object. |
![]() | Serves as a hash function for a particular type. |
![]() | Gets the Type of the current instance. |
![]() | Runs the external merge tool configured by P4MERGE. |
![]() | Returns a String that represents the current Object. |
![]() | Allows an Object to attempt to free resources and perform other cleanup operations before the Object is reclaimed by garbage collection. |
![]() | Creates a shallow copy of the current Object. |
MergeData Class | P4API Namespace