Hello,
I think I figured out how to get it working for you. For that version on OSX, change the "diff" command to be "bcomp1" from bcomp, and change the merge to "bcomp2" from bcomp. And, be certain to fully shut down TortoiseHG and then restart the application to apply the changes.
I've seen a similar problem with specific versions of Git, where bcomp became a keyword in the configuration for a specific OS, but caused problems with the other OS distributions. Hopefully 3.1.1 updates and works with built-in support soon. If not, we'll need to update our instructions.
I think I figured out how to get it working for you. For that version on OSX, change the "diff" command to be "bcomp1" from bcomp, and change the merge to "bcomp2" from bcomp. And, be certain to fully shut down TortoiseHG and then restart the application to apply the changes.
I've seen a similar problem with specific versions of Git, where bcomp became a keyword in the configuration for a specific OS, but caused problems with the other OS distributions. Hopefully 3.1.1 updates and works with built-in support soon. If not, we'll need to update our instructions.
Comment