From owner-freebsd-stable@FreeBSD.ORG  Wed Sep 28 22:49:29 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 DE08D16A41F
	for <freebsd-stable@freebsd.org>; Wed, 28 Sep 2005 22:49:29 +0000 (GMT)
	(envelope-from dougb@FreeBSD.org)
Received: from mail2.fluidhosting.com (mail2.fluidhosting.com [204.14.90.62])
	by mx1.FreeBSD.org (Postfix) with SMTP id 56F7643D48
	for <freebsd-stable@freebsd.org>; Wed, 28 Sep 2005 22:49:29 +0000 (GMT)
	(envelope-from dougb@FreeBSD.org)
Received: (qmail 80474 invoked by uid 399); 28 Sep 2005 22:49:28 -0000
Received: from mail1.fluidhosting.com (204.14.90.61)
	by mail2.fluidhosting.com with SMTP; 28 Sep 2005 22:49:28 -0000
Received: (qmail 4876 invoked by uid 399); 28 Sep 2005 22:49:28 -0000
Received: from localhost (HELO ?192.168.0.5?) (dougb@dougbarton.net@127.0.0.1)
	by localhost with SMTP; 28 Sep 2005 22:49:28 -0000
Message-ID: <433B1DF7.9020303@FreeBSD.org>
Date: Wed, 28 Sep 2005 15:49:27 -0700
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://www.FreeBSD.org/
User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Brad Knowles <brad@stop.mail-abuse.org>
References: <p0620070ebf57657f0697@[10.0.1.210]>
	<p0620071dbf6044e1c455@[10.0.1.210]>
In-Reply-To: <p0620071dbf6044e1c455@[10.0.1.210]>
X-Enigmail-Version: 0.92.1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
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
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 22:49:30 -0000

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 mergemaster,
which has had this example in it for a long time now.