From owner-freebsd-stable@FreeBSD.ORG Sat Jan 10 04:14:19 2009 Return-Path: Delivered-To: freebsd-stable@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDCA21065674 for ; Sat, 10 Jan 2009 04:14:19 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 6462C8FC0C for ; Sat, 10 Jan 2009 04:14:19 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 13262 invoked by uid 399); 10 Jan 2009 03:47:39 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 10 Jan 2009 03:47:39 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <49681A59.20002@FreeBSD.org> Date: Fri, 09 Jan 2009 19:47:37 -0800 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.19 (X11/20090102) MIME-Version: 1.0 To: Mike Lempriere References: <200901081047.n08Alg2h000825@lurza.secnetix.de> <496819F0.9@vintners.net> In-Reply-To: <496819F0.9@vintners.net> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Andrei Kolu , freebsd-stable@FreeBSD.ORG, freebsd@byshenk.net Subject: Re: mergemaster broken -- take 2 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jan 2009 04:14:20 -0000 Mike Lempriere wrote: > Thanks everyone for the advice -- I got it working this time just fine. > Works much better when one follows the directions accurately instead of > by memory. W00t! :) -- This .signature sanitized for your protection