From owner-freebsd-current@FreeBSD.ORG  Thu Apr 19 13:35:53 2007
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@freebsd.org
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8A41416A406
	for <freebsd-current@freebsd.org>; Thu, 19 Apr 2007 13:35:53 +0000 (UTC)
	(envelope-from henrik@brixandersen.dk)
Received: from solow.pil.dk (relay.pil.dk [195.41.47.164])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E3FE13C457
	for <freebsd-current@freebsd.org>; Thu, 19 Apr 2007 13:35:52 +0000 (UTC)
	(envelope-from henrik@brixandersen.dk)
Received: from tirith.brixandersen.dk (osgiliath.brixandersen.dk
	[87.53.223.189]) by solow.pil.dk (Postfix) with ESMTP id CCF351CC0D3;
	Thu, 19 Apr 2007 15:35:51 +0200 (CEST)
Received: by tirith.brixandersen.dk (Postfix, from userid 1001)
	id 09306B838; Thu, 19 Apr 2007 15:35:50 +0200 (CEST)
Date: Thu, 19 Apr 2007 15:35:50 +0200
From: Henrik Brix Andersen <henrik@brixandersen.dk>
To: freebsd-current@freebsd.org
Message-ID: <20070419133550.GA65054@tirith.brixandersen.dk>
Mail-Followup-To: freebsd-current@freebsd.org, dougb@FreeBSD.org
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="PEIAKu/WMn1b1Hv9"
Content-Disposition: inline
X-PGP-Key: http://www.brixandersen.dk/files/HenrikBrixAndersen.asc
User-Agent: Mutt/1.5.15 (2007-04-06)
Cc: dougb@FreeBSD.org
Subject: RFT: bin/106642: [patch] Allow excluding certain files from
	mergemaster(8)
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 13:35:53 -0000


--PEIAKu/WMn1b1Hv9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

Back in December I submitted a small patch for mergemaster(8) to allow
excluding files such as /etc/mail/mailer.conf from comparison as
bin/106642.

The PR was given to dougb@ for review, but he never replied to the PR
nor to my private mail - he must be busy elsewhere :)

If somebody could review, test and perhaps even commit the patch for
me, I would be very grateful.

http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dbin/106642

Regards,
Brix
--=20
Henrik Brix Andersen <henrik@brixandersen.dk>

--PEIAKu/WMn1b1Hv9
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
Comment: GnuPG signed

iD8DBQFGJ3A2v+Q4flTiePgRAiDkAKC+uKsVY9bTCT5q0QmmFKzSCOMytwCcDajL
A2csNepeYpc/ba7xL83Yjsk=
=0lnj
-----END PGP SIGNATURE-----

--PEIAKu/WMn1b1Hv9--