Mac OS X 10.5.3: FileMerge.app not trying the merge as it should

Matt Mackall mpm at selenic.com
Tue Jun 24 13:52:58 CDT 2008


On Tue, 2008-06-24 at 15:16 +0200, 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).
> 
> 
> any clues on what can be wrong?

Try running merge with the --debug switch.

-- 
Mathematics is the supreme nostalgia of our time.



More information about the Mercurial mailing list