[RFC] two improvements to mercurial

[Bryan O'Sullivan]

On Mon, 2005-08-29 at 23:31 -0500, Jordan Breeding wrote:

> I am attaching a rudimentary patch to add support for using FileMerge  
> only on Darwin and only when FileMerge exists in its default  
> location.

I'm going to sit on this for a bit, because Matt hasn't rushed to add
support for new merge programs to hgmerge.  If it goes in, it won't
happen until next week some time.

	<b