How to use p4merge as the merge/diff tool for Mercurial?
This will work for merging: Place this into your ~/.hgrc (or, optionally, your Mercurial.ini on Windows): [merge-tools] p4.priority = 100 p4.premerge = True # change this to False if you’re don’t trust hg’s internal merge p4.executable = /Applications/p4merge.app/Contents/MacOS/p4merge p4.gui = True p4.args = $base $local $other $output Requires Mercurial 1.0 or newer. Clearly you’ll need … Read more