From owner-freebsd-current@FreeBSD.ORG  Mon Jan 19 12:10:58 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 162BD16A4CE
	for <freebsd-current@freebsd.org>;
	Mon, 19 Jan 2004 12:10:58 -0800 (PST)
Received: from mailhub2.midco.net (mailhub2.midco.net [24.220.0.34])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 03BFB43D5D
	for <freebsd-current@freebsd.org>;
	Mon, 19 Jan 2004 12:10:55 -0800 (PST)
	(envelope-from pmes@bis.midco.net)
Received: (qmail 14480 invoked by uid 0); 19 Jan 2004 20:10:54 -0000
Received: from host-195-219-220-24.midco.net (HELO bis.midco.net)
	([24.220.219.195])          (envelope-sender <pmes@bis.midco.net>)
	by lvs-pop.midco.net (qmail-ldap-1.03) with SMTP
	for <rihad@mail.ru>; 19 Jan 2004 20:10:54 -0000
Message-ID: <400C39CC.6030807@bis.midco.net>
Date: Mon, 19 Jan 2004 14:10:52 -0600
From: Peter Schultz <pmes@bis.midco.net>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.6b) Gecko/20031215
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: rihad <rihad@mail.ru>
References: <400C012E.4040002@mail.ru>
In-Reply-To: <400C012E.4040002@mail.ru>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
cc: freebsd-current@freebsd.org
Subject: Re: question on mergemaster
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 19 Jan 2004 20:10:58 -0000

rihad wrote:
> Hi. I was wondering if there are any improvements planned to be made to
> mergemaster?
> 
Here's one for the Bikeshed Report page, I can tell be the echo of a 
thousand pyloric valves slamming shut.  :-)

> sorry if this is a bit offtopic.
> 
Anytime this is your last statement in an e-mail, send it to file 13.

Pete...