From owner-freebsd-stable@FreeBSD.ORG  Wed Sep 28 23:01:04 2005
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
X-Original-To: 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 6803316A41F
	for <freebsd-stable@freebsd.org>; Wed, 28 Sep 2005 23:01:04 +0000 (GMT)
	(envelope-from robbak@gmail.com)
Received: from wproxy.gmail.com (wproxy.gmail.com [64.233.184.198])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AAA0843D53
	for <freebsd-stable@freebsd.org>; Wed, 28 Sep 2005 23:01:03 +0000 (GMT)
	(envelope-from robbak@gmail.com)
Received: by wproxy.gmail.com with SMTP id 37so13349wra
	for <freebsd-stable@freebsd.org>; Wed, 28 Sep 2005 16:01:02 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com;
	h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=SzaD9zvEJLa75jT1IwxdgpegixYc0395BIKkk52oiHZbEPv5f8HA/kajNATo89zsuzrqsZl7wrqNforG2QIU1P0cUoRwY9R8++dK8OvRhuqYGsJmu0snLse+t/48Ha0JZ01YF9MeMNc+2Eh6kZLJzsf+YcSD9t4NQNrfoKTjtmI=
Received: by 10.54.49.10 with SMTP id w10mr142896wrw;
	Wed, 28 Sep 2005 16:01:02 -0700 (PDT)
Received: by 10.54.130.7 with HTTP; Wed, 28 Sep 2005 16:01:02 -0700 (PDT)
Message-ID: <d449958050928160142dc897a@mail.gmail.com>
Date: Thu, 29 Sep 2005 09:01:02 +1000
From: Robert Backhaus <robbak@gmail.com>
To: Doug Barton <dougb@freebsd.org>
In-Reply-To: <433B1DF7.9020303@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
References: <p0620070ebf57657f0697@10.0.1.210>
	<p0620071dbf6044e1c455@10.0.1.210> <433B1DF7.9020303@FreeBSD.org>
Cc: FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org>
Subject: Re: Advice sought on upgrading from 4.11-R to 5.4...
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Robert Backhaus <robbak@gmail.com>
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: Wed, 28 Sep 2005 23:01:04 -0000

On 9/29/05, Doug Barton <dougb@freebsd.org> wrote:
> Brad Knowles wrote:
>
> >     However, it would be nice if mergemaster could be made to
> > automatically accept changes that occur only in the comments of the
> > files it is trying to merge.
>
> What would be nice is if people actually read the man page for mergemaste=
r,
> which has had this example in it for a long time now.

I just read the mergemaster man page (6.0B2 box), and it contains no
usch example, or reference. None of the options seem to have this
effect either.

Maybe you are thinking of an Open- of NetBSD mergemaster?