Mac OS X 10.5.3: FileMerge.app not trying the merge as it should
Oscar Sanchez Casamitjana
oscar.lists at mac.com
Tue Jun 24 16:37:56 CDT 2008
> Oscar Sanchez Casamitjana wrote:
>> hi,
>>
>> I'm on Mac OS X 10.5.3, with mercurial 1.0.1 installed via .pkg
>> from Lee Cantey (I have a problem with easy_installing, for which I
>> will open a thread later), and Apple's factory Python (2.5.1).
>>
>> when I have a merge, FileMerge.app rightly opens, but instead of
>> showing the three way merge window it opens only the file chooser
>> dialog. I have an older system with the same setup, except that I
>> installed Mercurial with easy_install, and it does de merge
>> operation just right (opening the three way merge window in
>> FileMerge.app, etc).
On Jun 24, 2008, at 11:14 PM, tomba wrote:
> See instructions at the bottom of http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram
> .
> Remember to make sure opendiff-w script is in your $PATH and has
> executable permission bit set.
> Does this help?
thanks tomba, now it works perfectly. I suppose I should have RTFM,
but the fact is that the previous time I did the Mercurial install I
didn't need to do this (IIRC, BTW), so I thought I had something broken.
regards,
oscar.
More information about the Mercurial
mailing list