Mercurial merging

I finally got around to downloading a graphical merge program so that I can get through merging in Mercurial more easily. I decided on Meld, and downloaded it using Fink.  It worked out for me, although I have to admit I didn’t read any instructions, I just sort of guessed at what to do in the Meld software.  To get it to open automatically when merging with Mercurial, I added one line to my .hgrc file:

merge = meld

Here’s a screenshot:

I originally tried to get kdiff3, but was getting errors for one of the dependencies in Fink.

Leave a Reply

Your email address will not be published. Required fields are marked *