<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">hi,<div><br></div><div>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).</div><div><br></div><div>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).</div><div><br></div><div>any clues on what can be wrong?</div><div><br></div><div><br></div><div><br></div><div>thanks,</div><div>oscar.</div><div><span class="Apple-style-span" style="font-family: 'Helvetica Neue'; font-size: 16px; "></span></div></body></html>