From owner-freebsd-questions@FreeBSD.ORG Thu Jul 12 16:36:27 2007 Return-Path: <owner-freebsd-questions@FreeBSD.ORG> 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 4CBB316A468 for <freebsd-questions@freebsd.org>; Thu, 12 Jul 2007 16:36: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 14FB413C484 for <freebsd-questions@freebsd.org>; Thu, 12 Jul 2007 16:36:26 +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 l6CGaKIZ018340 for <freebsd-questions@freebsd.org>; Thu, 12 Jul 2007 12:36:25 -0400 (EDT) Received: from tigger.digitaltorque.ca (tigger.digitaltorque.ca [192.168.1.3]) by kanga.digitaltorque.ca (Postfix) with ESMTP id 928045C for <freebsd-questions@freebsd.org>; Thu, 12 Jul 2007 12:10:46 -0400 (EDT) Received: by tigger.digitaltorque.ca (Postfix, from userid 500) id C0EFB240F4; Thu, 12 Jul 2007 12:36:14 -0400 (EDT) Date: Thu, 12 Jul 2007 12:36:14 -0400 From: "Michael P. Soulier" <msoulier@digitaltorque.ca> To: freebsd-questions@freebsd.org Message-ID: <20070712163614.GI1254@tigger.digitaltorque.ca> Mail-Followup-To: freebsd-questions@freebsd.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Hlh2aiwFLCZwGcpw" Content-Disposition: inline User-Agent: Mutt/1.4.2.1i Subject: macosx stuff seeping into the ports? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions <freebsd-questions.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, <mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions> List-Post: <mailto:freebsd-questions@freebsd.org> List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, <mailto:freebsd-questions-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 12 Jul 2007 16:36:27 -0000 --Hlh2aiwFLCZwGcpw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I just tried a merge with mercurial, built out of ports.=20 /usr/local/bin/hgmerge: /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge: n= ot found Umm, why the hell would I have that on FreeBSD?? Mike --=20 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 --Hlh2aiwFLCZwGcpw Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQFGllh+KGqCc1vIvggRAjuuAJ9KX4gfRMrfR+f7STWjI1fjIXG4RQCfURL/ L7DDUupnC0cjqdm3LVxqtsc= =HHuw -----END PGP SIGNATURE----- --Hlh2aiwFLCZwGcpw--