2 Replies



Thanks for the response! I didn’t notice it until now because I had comment notifications shut off.

“What I don’t see is your gripe about merging from the command line. Aren’t you merging on your dev-box? Don’t you have visual tools for the actual file-merges there? You can even use p4merge. (http://mercurial.selenic.com/wiki/MergeProgram)”

On my dev box I now use Murky, which is great! I tried MacHG as well, which is even sexier-looking, but doesn’t show diffs automatically. The P4Merge integration was working on my old Mac, but I haven’t gotten around to setting it up again because I haven’t had to merge locally yet.

The problem was really on my Debian machine, on which I have only headless SSH access.

“Sadly, TortoiseHg is not yet available for OS X. I use it on Ubuntu and simply love the way it lets me work from the command line and seamlessly switch into GUI mode as needed.”

+1 for TortoiseHG on Windows as well. As I said, though, there are all of a sudden two very strong contenders on OS X, so that’s a relief.