Date: Thu, 12 Jul 2007 13:18:16 -0400 From: "Michael P. Soulier" <msoulier@digitaltorque.ca> To: freebsd-questions@freebsd.org Subject: Re: macosx stuff seeping into the ports? Message-ID: <20070712171815.GK1254@tigger.digitaltorque.ca> In-Reply-To: <20070712163614.GI1254@tigger.digitaltorque.ca> References: <20070712163614.GI1254@tigger.digitaltorque.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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 <msoulier@digitaltorque.ca> "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 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQFGlmJXKGqCc1vIvggRApmeAJ46dU8mshcjFLmDk7M6jSFHgQhkdACgod8z hk7fPhyKPKhkogjhb951/sc= =RICk -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070712171815.GK1254>