The first parameters up to - are merge bases the rest are heads.bases head. Put the full path to the P4Merge program in quotes when calling P4Merge as a third party (other) application, as configured in the preferences for P4V in the Merge tab. If the program you use takes its arguments in a different order, set P4MERGE to a shell script or batch file that reorders the arguments and calls the proper merge program. Ensure there is no file called 'program' in the C: drive (in this example). When p4 resolve calls this program, it passes four arguments, representing (in order) base, theirs, and yours, with the fourth argument holding the resulting merge file.
10005 silly gentlyRm C:\inetpub\verbose afterAdd C:\Users\dpoindexter\AppData\Roaming\npm-cache\hawk\2.3.1\package\package. This can be useful for files with names truncated after a file transfer. Ensure that p4merge.exe exists in the specified directory.
0 kommentar(er)
