On 12/07/07 Michael P. Soulier said: > I just tried a merge with mercurial, built out of ports. > > /usr/local/bin/hgmerge: > /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge: not > found > > Umm, why the hell would I have that on FreeBSD??
Hmm, actually looks like a bug in hgmerge itself. I can override with the HGMERGE environment variable for now, but that's broken. Mike -- Michael P. Soulier <[EMAIL PROTECTED]> "Any intelligent fool can make things bigger and more complex... It takes a touch of genius - and a lot of courage to move in the opposite direction." --Albert Einstein
Description: PGP signature