From owner-freebsd-questions@FreeBSD.ORG  Sun Nov 18 08:36:06 2007
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 8C6E516A417
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 08:36:06 +0000 (UTC)
	(envelope-from keramida@freebsd.org)
Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36])
	by mx1.freebsd.org (Postfix) with ESMTP id E48C513C48A
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 08:36:05 +0000 (UTC)
	(envelope-from keramida@freebsd.org)
Received: from kobe.laptop (dialup83.ach.sch.gr [81.186.70.83])
	(authenticated bits=128)
	by igloo.linux.gr (8.14.1/8.14.1/Debian-9) with ESMTP id lAI8ZT5B015306
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Sun, 18 Nov 2007 10:35:43 +0200
Received: from kobe.laptop (kobe.laptop [127.0.0.1])
	by kobe.laptop (8.14.2/8.14.2) with ESMTP id lAI8ZRme083296;
	Sun, 18 Nov 2007 10:35:27 +0200 (EET)
	(envelope-from keramida@freebsd.org)
Received: (from keramida@localhost)
	by kobe.laptop (8.14.2/8.14.2/Submit) id lAI8ZOVS083295;
	Sun, 18 Nov 2007 10:35:24 +0200 (EET)
	(envelope-from keramida@freebsd.org)
Date: Sun, 18 Nov 2007 10:35:24 +0200
From: Giorgos Keramidas <keramida@freebsd.org>
To: Howard Goldstein <hg@queue.to>
Message-ID: <20071118083524.GB83139@kobe.laptop>
References: <20071117043426.GA71265@auricle.charter.net>
	<20071117181156.GC2834@kobe.laptop> <473F9002.6040703@queue.to>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <473F9002.6040703@queue.to>
X-Hellug-MailScanner: Found to be clean
X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached,
	score=-4.136, required 5, autolearn=not spam, ALL_TRUSTED -1.80,
	AWL 0.26, BAYES_00 -2.60)
X-Hellug-MailScanner-From: keramida@freebsd.org
X-Spam-Status: No
Cc: freebsd-questions@freebsd.org
Subject: Re: Making mergemaster skip certain files
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Sun, 18 Nov 2007 08:36:06 -0000

On 2007-11-17 20:06, Howard Goldstein <hg@queue.to> wrote:
> Giorgos Keramidas wrote:
> > On 2007-11-16 22:34, "J. Porter Clark" <jpc@porterclark.com> wrote:
> > mergemaster for more details, but here's a short description of what I
> > use on my laptop for some time now:
>
> > 1. A `.mergemasterrc' file in the HOME directory of the `root' user,
> >    which contains:
> >    [snip]
> >
> > 2. The `/root/mm-pre-compare.sh' script contains the following:
> >    [snip]
>
> Please consider submitting this as a PR in hopes it gets included in
> the actual package.

Since mergemaster is included in the base system, I can directly commit
to its manpage.  There is already a description of `.mergemasterrc' in
the manpage, so I'm guessing you want a sample script added?