From owner-freebsd-hackers  Wed Jun 13 20:15:50 2001
Delivered-To: freebsd-hackers@freebsd.org
Received: from mailout3.nyroc.rr.com (mailout3-0.nyroc.rr.com [24.92.226.118])
	by hub.freebsd.org (Postfix) with ESMTP
	id E8C8337B403; Wed, 13 Jun 2001 20:15:43 -0700 (PDT)
	(envelope-from James_Bond_79@yahoo.com)
Received: from Halstead007 (roc-24-169-196-57.rochester.rr.com [24.169.196.57])
	by mailout3.nyroc.rr.com (8.11.2/RoadRunner 1.03) with SMTP id f5E3EHh02170;
	Wed, 13 Jun 2001 23:14:17 -0400 (EDT)
Content-Type: Multipart/Mixed;
  charset="iso-8859-1";
  boundary="------------Boundary-00=_EAHW7K4XG1OCLQK6MI1F"
From: James <James_Bond_79@yahoo.com>
To: dougb@freebsd.org
Subject: Re: mergmaster bug
Date: Wed, 13 Jun 2001 23:20:38 -0400
X-Mailer: KMail [version 1.2]
Cc: freebsd-hackers@freebsd.org
References: <01061323145802.00417@Halstead007>
In-Reply-To: <01061323145802.00417@Halstead007>
MIME-Version: 1.0
Message-Id: <01061323203803.00417@Halstead007>
Sender: owner-freebsd-hackers@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-hackers.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-hackers>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-hackers>
X-Loop: FreeBSD.ORG


--------------Boundary-00=_EAHW7K4XG1OCLQK6MI1F
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
Subject: 

Sorry, line wrapped attached diff file as attachement this time.

James
--------------Boundary-00=_EAHW7K4XG1OCLQK6MI1F
Content-Type: text/plain;
  charset="iso-8859-1";
  name="mergmaster.sh.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="mergmaster.sh.diff"

LS0tIG1lcmdlbWFzdGVyLnNoLm9yaWcJV2VkIEp1biAxMyAyMDowODowMSAyMDAxCisrKyBtZXJn
ZW1hc3Rlci5zaAlXZWQgSnVuIDEzIDIxOjA5OjU0IDIwMDEKQEAgLTQ3MSw3ICs0NzEsNyBAQAog
ICAgIGVjaG8gJyAqKiogUHJlc3MgW0VudGVyXSBvciBbUmV0dXJuXSBrZXkgdG8gY29udGludWUn
CiAgICAgcmVhZCBBTllfS0VZCiAgICAgdW5zZXQgQU5ZX0tFWQotICAgIGRpZmYgLXFyICR7REVT
VERJUn0vZXRjICR7VEVNUFJPT1R9L2V0YyB8IGdyZXAgIl5Pbmx5IGluIC9ldGMiIHwgJHtQQUdF
Un0KKyAgICBkaWZmIC1xciAke0RFU1RESVJ9L2V0YyAke1RFTVBST09UfS9ldGMgfCBncmVwICJe
T25seSBpbiAke0RFU1RESVJ9L2V0YyIgfCAke1BBR0VSfQogICAgIGVjaG8gJycKICAgICBlY2hv
ICcgKioqIFByZXNzIFtFbnRlcl0gb3IgW1JldHVybl0ga2V5IHRvIGNvbnRpbnVlJwogICAgIHJl
YWQgQU5ZX0tFWQo=

--------------Boundary-00=_EAHW7K4XG1OCLQK6MI1F--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message