From owner-freebsd-questions@FreeBSD.ORG  Mon Mar  3 15:55:39 2008
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45A1C1065675
	for <freebsd-questions@freebsd.org>;
	Mon,  3 Mar 2008 15:55:39 +0000 (UTC)
	(envelope-from freebsd-questions-local@be-well.ilk.org)
Received: from be-well.ilk.org (dsl092-078-145.bos1.dsl.speakeasy.net
	[66.92.78.145]) by mx1.freebsd.org (Postfix) with ESMTP id 26F1E8FC16
	for <freebsd-questions@freebsd.org>;
	Mon,  3 Mar 2008 15:55:38 +0000 (UTC)
	(envelope-from freebsd-questions-local@be-well.ilk.org)
Received: by be-well.ilk.org (Postfix, from userid 1147)
	id BEECF28430; Mon,  3 Mar 2008 10:55:37 -0500 (EST)
To: Chris Maness <chris@chrismaness.com>
References: <47CA2C53.8050209@chrismaness.com>
From: Lowell Gilbert <freebsd-questions-local@be-well.ilk.org>
Date: Mon, 03 Mar 2008 10:55:37 -0500
In-Reply-To: <47CA2C53.8050209@chrismaness.com> (Chris Maness's message of
	"Sat\, 01 Mar 2008 20\:25\:55 -0800")
Message-ID: <4463w34xae.fsf@be-well.ilk.org>
User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: freebsd-questions@freebsd.org
Subject: Re: freebsd-update and mergemaster
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-questions@freebsd.org
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: Mon, 03 Mar 2008 15:55:39 -0000

Chris Maness <chris@chrismaness.com> writes:

> I was wondering if it was possible to use mergemaster with the binary
> update tool.  It seemed like a much better way than freebsd-update
> dumping me into vi.  I don't understand what it wants me to do with
> vi.  Mergemaster is very clear.  Can someone please shed light.

Mergemaster just uses sdiff(1).  Perhaps freebsd-update can be
configured (e.g., with an EDITOR setting) to do the same?