From owner-freebsd-questions@FreeBSD.ORG Mon Mar 13 08:45:40 2006 Return-Path: X-Original-To: freebsd-questions@freebsd.org Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3A3B16A400 for ; Mon, 13 Mar 2006 08:45:40 +0000 (UTC) (envelope-from norgaard@locolomo.org) Received: from strange.daemonsecurity.com (59.Red-81-33-11.staticIP.rima-tde.net [81.33.11.59]) by mx1.FreeBSD.org (Postfix) with ESMTP id 440CA43D46 for ; Mon, 13 Mar 2006 08:45:39 +0000 (GMT) (envelope-from norgaard@locolomo.org) Received: from [172.24.8.84] (generic.ATOSORIGIN.ES [212.170.156.200]) by strange.daemonsecurity.com (Postfix) with ESMTP id A1AC02E041; Mon, 13 Mar 2006 09:45:44 +0100 (CET) Message-ID: <4415312A.4000608@locolomo.org> Date: Mon, 13 Mar 2006 09:45:30 +0100 From: Erik Norgaard User-Agent: Thunderbird 1.5 (X11/20060118) MIME-Version: 1.0 To: Peter References: <20060313042144.33267.qmail@web60021.mail.yahoo.com> In-Reply-To: <20060313042144.33267.qmail@web60021.mail.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-questions Subject: Re: where is mergemaster? 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: Mon, 13 Mar 2006 08:45:41 -0000 Peter wrote: > Where can I find mergemaster? I would like to upgrade my box. It should be in your path, but I have also had problems with my path not being set correctly in single user mode. If you choose csh as shell in single user then run csh .cshrc IIRC this should set your environment correctly. Cheers, Erik -- Ph: +34.666334818 web: www.locolomo.org S/MIME Certificate: www.daemonsecurity.com/ca/8D03551FFCE04F06.crt Subject ID: 9E:AA:18:E6:94:7A:91:44:0A:E4:DD:87:73:7F:4E:82:E7:08:9C:72 Fingerprint: 5B:D5:1E:3E:47:E7:EC:1C:4C:C8:3A:19:CC:AE:14:F5:DF:18:0F:B9