From owner-freebsd-stable@FreeBSD.ORG  Mon Apr 21 08:21:27 2003
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0D50937B47C
	for <freebsd-stable@freebsd.org>;
	Mon, 21 Apr 2003 08:21:25 -0700 (PDT)
Received: from olmec.nighttide.net (jasper.nighttide.net [207.5.141.146])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CCB4F43FE1
	for <freebsd-stable@freebsd.org>;
	Mon, 21 Apr 2003 08:21:23 -0700 (PDT)
	(envelope-from darren@nighttide.net)
Received: from localhost (darren@localhost [127.0.0.1])
	by olmec.nighttide.net (8.12.9/8.12.9) with ESMTP id h3LFLLSI009467;
	Mon, 21 Apr 2003 11:21:22 -0400 (EDT)
	(envelope-from darren@nighttide.net)
Date: Mon, 21 Apr 2003 11:21:21 -0400 (EDT)
From: Darren Henderson <darren@nighttide.net>
To: Olivier Tharan <olive@oban.frmug.org>
In-Reply-To: <20030421093542.GB1287@weirdos.oban.frmug.org>
Message-ID: <Pine.BSF.4.53.0304211117530.9310@olmec>
References: <20030420161118.P631@znfgre.tberna.bet>
	<006701c307a5$ee7948b0$0200a8c0@travel>
	<20030421093542.GB1287@weirdos.oban.frmug.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: freebsd-stable@freebsd.org
Subject: Re: Mergemaster Request (RE: mergemaster tips)
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 21 Apr 2003 15:21:28 -0000

On Mon, 21 Apr 2003, Olivier Tharan wrote:

> You should review the man page to understand each option. What I usually
> add between both commands is "PAGER=less" because I prefer less to more
> to view the diffs.

On stock 4.something systems (not sure when it changed - a year or more
ago I think) more is less. Try /usr/bin/more --help  for a quick
confirmation.

______________________________________________________________________
Darren Henderson                                  darren@nighttide.net

                   Help fight junk e-mail, visit http://www.cauce.org/