From owner-freebsd-questions@FreeBSD.ORG Thu Jul 12 17:18:27 2007 Return-Path: X-Original-To: freebsd-questions@freebsd.org Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 693C716A469 for ; Thu, 12 Jul 2007 17:18:27 +0000 (UTC) (envelope-from msoulier@digitaltorque.ca) Received: from mail.storm.ca (mail.storm.ca [209.87.239.66]) by mx1.freebsd.org (Postfix) with ESMTP id 2B21813C44B for ; Thu, 12 Jul 2007 17:18:27 +0000 (UTC) (envelope-from msoulier@digitaltorque.ca) Received: from kanga.digitaltorque.ca (hs-216-106-102-70.storm.ca [216.106.102.70]) by mail.storm.ca (8.14.0+Sun/8.14.0) with ESMTP id l6CHILuq023526 for ; Thu, 12 Jul 2007 13:18:26 -0400 (EDT) Received: from tigger.digitaltorque.ca (tigger.digitaltorque.ca [192.168.1.3]) by kanga.digitaltorque.ca (Postfix) with ESMTP id 01FC75C for ; Thu, 12 Jul 2007 12:52:47 -0400 (EDT) Received: by tigger.digitaltorque.ca (Postfix, from userid 500) id 3956C240F4; Thu, 12 Jul 2007 13:18:16 -0400 (EDT) Date: Thu, 12 Jul 2007 13:18:16 -0400 From: "Michael P. Soulier" To: freebsd-questions@freebsd.org Message-ID: <20070712171815.GK1254@tigger.digitaltorque.ca> Mail-Followup-To: freebsd-questions@freebsd.org References: <20070712163614.GI1254@tigger.digitaltorque.ca> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="MzdA25v054BPvyZa" Content-Disposition: inline In-Reply-To: <20070712163614.GI1254@tigger.digitaltorque.ca> User-Agent: Mutt/1.4.2.1i Subject: Re: macosx stuff seeping into the ports? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 17:18:27 -0000 --MzdA25v054BPvyZa Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 12/07/07 Michael P. Soulier said: > I just tried a merge with mercurial, built out of ports.=20 >=20 > /usr/local/bin/hgmerge: > /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge:= not > found >=20 > Umm, why the hell would I have that on FreeBSD?? Hmm, actually looks like a bug in hgmerge itself.=20 I can override with the HGMERGE environment variable for now, but that's broken.=20 Mike --=20 Michael P. Soulier "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 --MzdA25v054BPvyZa Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQFGlmJXKGqCc1vIvggRApmeAJ46dU8mshcjFLmDk7M6jSFHgQhkdACgod8z hk7fPhyKPKhkogjhb951/sc= =RICk -----END PGP SIGNATURE----- --MzdA25v054BPvyZa--