From owner-freebsd-stable@FreeBSD.ORG  Fri May 16 15:11:02 2008
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
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 4D27A10656C9
	for <freebsd-stable@freebsd.org>; Fri, 16 May 2008 15:11:02 +0000 (UTC)
	(envelope-from lists-fbsdstable@shadypond.com)
Received: from mx-outbound01.easydns.com (mailout1.easydns.com [205.210.42.66])
	by mx1.freebsd.org (Postfix) with ESMTP id 26A758FC23
	for <freebsd-stable@freebsd.org>; Fri, 16 May 2008 15:11:01 +0000 (UTC)
	(envelope-from lists-fbsdstable@shadypond.com)
Received: from lilypad.shadypond.com (69-12-173-117.static.humboldt1.com
	[69.12.173.117])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx-outbound01.easydns.com (Postfix) with ESMTP id E0B7148966
	for <freebsd-stable@freebsd.org>; Fri, 16 May 2008 10:40:19 -0400 (EDT)
Received: from slider.shadypond.com (slider.shadypond.com [192.168.1.11])
	by lilypad.shadypond.com (Postfix) with ESMTPS id 6CF1DB87D
	for <freebsd-stable@freebsd.org>; Fri, 16 May 2008 14:42:52 +0000 (UTC)
From: Pollywog <lists-fbsdstable@shadypond.com>
To: freebsd-stable@freebsd.org
Date: Fri, 16 May 2008 14:42:49 +0000
References: <784966050805151644m43b9a5e1qe8a4568576fc081f@mail.gmail.com>
	<784966050805152304t1827c53bi6988ae9c8f837f32@mail.gmail.com>
	<20080516061724.GA47953@eos.sc1.parodius.com>
In-Reply-To: <20080516061724.GA47953@eos.sc1.parodius.com>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200805161442.51667.lists-fbsdstable@shadypond.com>
Subject: Re: today's build is causing errors for me
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 May 2008 15:11:02 -0000

On Friday 16 May 2008 06:17:24 Jeremy Chadwick wrote:

>
> Additionally, mergemaster isn't a confusing mess.  If anything, it's one
> of the most simple tools there is for managing /etc.  The part you
> probably find "confusing", which is the same part I did when I started
> using it, is the side-by-side interactive diff.  It's very easy to use;
> "r" means use the text shown on the right, and "l" means use the text
> shown on the left.

That is certainly the part that confused me until I referred to the "Absolute 
FreeBSD" book.