From: Michael S. Tsirkin <mst@mellanox.co.il>
Date: Thu, 08 Feb 2007 22:29:01 GMT
Subject: Re: git rebase: unexpected conflict
Message-ID: <20070208222901.GG6560@mellanox.co.il>
In-Reply-To: <7vk5ysz3n6.fsf@assigned-by-dhcp.cox.net>

> Quoting Junio C Hamano <junkio@cox.net>:
> Subject: Re: git rebase: unexpected conflict
> 
> "Michael S. Tsirkin" <mst@mellanox.co.il> writes:
> 
> > Junio, is the following patch correct?
> 
> Looks sane to me.

You can take it then :)

-- 
MST