From: Junio C Hamano <junkio@cox.net>
Date: Thu, 08 Feb 2007 22:27:25 GMT
Subject: Re: git rebase: unexpected conflict
Message-ID: <7vk5ysz3n6.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070208133921.GB20183@mellanox.co.il>

"Michael S. Tsirkin" <mst@mellanox.co.il> writes:

> Junio, is the following patch correct?

Looks sane to me.