Change 5435

kyle_turner (Kyle Turner)
Kyle Turner committed this change into //guest/kyle_turner/perforce/resolve
Request Review
Download .zip
Initial version of "p4 resolve" extensions using C++ P4API.
 Extensions allow users to give more weight to the external merge program specified by the environment variable $P4MERGE.  See README.txt for more information.
0 edited 8 added 0 deleted
Tip: Use n and p to cycle through the changes.