From owner-freebsd-current@FreeBSD.ORG  Mon Mar 20 23:40:18 2006
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 [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 60B0716A4A7;
	Mon, 20 Mar 2006 23:40:18 +0000 (UTC)
	(envelope-from sgk@troutmask.apl.washington.edu)
Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu
	[128.208.78.105])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 00C9D43D77;
	Mon, 20 Mar 2006 23:40:16 +0000 (GMT)
	(envelope-from sgk@troutmask.apl.washington.edu)
Received: from troutmask.apl.washington.edu (localhost [127.0.0.1])
	by troutmask.apl.washington.edu (8.13.4/8.13.4) with ESMTP id
	k2KNeGOv041203; Mon, 20 Mar 2006 15:40:16 -0800 (PST)
	(envelope-from sgk@troutmask.apl.washington.edu)
Received: (from sgk@localhost)
	by troutmask.apl.washington.edu (8.13.4/8.13.1/Submit) id
	k2KNeG9c041201; Mon, 20 Mar 2006 15:40:16 -0800 (PST)
	(envelope-from sgk)
Date: Mon, 20 Mar 2006 15:40:16 -0800
From: Steve Kargl <sgk@troutmask.apl.washington.edu>
To: Ruslan Ermilov <ru@freebsd.org>
Message-ID: <20060320234016.GA33003@troutmask.apl.washington.edu>
References: <20060320221741.GA13699@troutmask.apl.washington.edu>
	<20060320230009.GA55254@troutmask.apl.washington.edu>
	<20060320231604.GH83781@ip.net.ua>
	<20060320232746.GI83781@ip.net.ua>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060320232746.GI83781@ip.net.ua>
User-Agent: Mutt/1.4.2.1i
Cc: freebsd-current@freebsd.org
Subject: Re: mergemaster broken?
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: Mon, 20 Mar 2006 23:40:18 -0000

On Tue, Mar 21, 2006 at 01:27:46AM +0200, Ruslan Ermilov wrote:
>
> The attached patch seems to work.
> 

Yes.  It appears to work.  Thanks for such a quick response.

-- 
Steve