I have P4Merge set up within mercurial as both an external diff and the merge tool. These are both working well from the command line.
I have setup MacHg to use the mercurial settings based on my ~/.hgrc. Diff works great from MacHg, using P4merge, but merging always generates the following message: "Mercurial reported error number 1: tool p4 requires a GUI warning: conflicts during merge. Merging test failed!
Any chance you could let me know what might be going wrong?
MacHG 0.9.8 with internal mercurial binary Mac OS X 10.6.4