Helix Visual Merge Tool (P4Merge) is a three-way merging and side-by-side file comparison tool. Use it to visualize your merges, obtain comprehensive file history, and compare a broad range of image files. Download the tool to get started. I'm guessing there's a CLI tool for p4merge (which I know nothing about). I wrote a blog post about using Changes.app, and some other GUI tools with Mercurial: Using Mercurial with GUI Tools. Basically, you need to know the calling expectations of the CLI tool that loads up the diff tool.
Kaleidoscope is the world’s most powerful file comparison app. Compare different text files, images, and folders on your Mac and iPad. Review and merge changes in a matter of seconds (merging available only on the Mac).
About the App
- App name: P4Merge
- App description: p4merge (App: p4merge.app)
- App website: http://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools
Install the App
Download P4merge Mac Download
- Press
Command+Space
and type Terminal and press enter/return key. - Run in Terminal app:
ruby -e '$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)' < /dev/null 2> /dev/null ; brew install caskroom/cask/brew-cask 2> /dev/null
and press enter/return key.
If the screen prompts you to enter a password, please enter your Mac's user password to continue. When you type the password, it won't be displayed on screen, but the system would accept it. So just type your password and press ENTER/RETURN key. Then wait for the command to finish. - Run:
brew cask install p4merge
Download P4merge Mac Pro
Done! You can now use P4Merge.