From owner-freebsd-hackers@FreeBSD.ORG  Thu Apr 10 00:16:51 2003
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 712EE37B401; Thu, 10 Apr 2003 00:16:51 -0700 (PDT)
Received: from sccrmhc03.attbi.com (sccrmhc03.attbi.com [204.127.202.63])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id B0A3543F3F; Thu, 10 Apr 2003 00:16:50 -0700 (PDT)
	(envelope-from DougB@freebsd.org)
Received: from master.gorean.org (12-234-22-23.client.attbi.com[12.234.22.23])
          by sccrmhc03.attbi.com (sccrmhc03) with SMTP
          id <2003041007164900300fcm04e>; Thu, 10 Apr 2003 07:16:49 +0000
Date: Thu, 10 Apr 2003 00:16:48 -0700 (PDT)
From: Doug Barton <DougB@FreeBSD.org>
To: Garance A Drosihn <drosih@rpi.edu>
In-Reply-To: <p05200f13bab6b291c0c5@[128.113.24.47]>
Message-ID: <20030410001510.P944@znfgre.tberna.bet>
References: <Pine.LNX.4.30.0304062328500.28875-100000@linux17.zdv.uni-tuebingen.de>
	<p05200f13bab6b291c0c5@[128.113.24.47]>
Organization: http://www.FreeBSD.org/
X-message-flag: Outlook -- Not just for spreading viruses anymore!
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: freebsd-hackers@freebsd.org
cc: Friedemann Becker <friedemann.becker@student.uni-tuebingen.de>
Subject: Re: generalized mergemaster(8)
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Apr 2003 07:16:51 -0000

On Mon, 7 Apr 2003, Garance A Drosihn wrote:

> The mignore will be welcome for /etc/motd, which I never want
> to change.

This is another problem I run into often, that people don't actually
understand what mergemaster is already capable of. :) If you read the man
page, you'll see the following option that you can add to
/etc/mergemaster.rc or ~/.mergemasterrc:

     # Don't compare the old and new motd files
     #IGNORE_MOTD=yes


-- 

    This .signature sanitized for your protection