Setting up p4merge as diff and merge tool on Windows. Tried for Git version 1.8.4.msysgit.0. Two alternatives are explained: using the command line, and directly editing the config file. Being the ...
P4Merge is included as part of Helix Visual Client (P4V). That is, the P4V.dmg includes HelixMFA.app, p4v.app, p4admin.app, p4merge.app, and p4vc. This Cask is otherwise identical to the Cask for p4v ...