From: Jeff King <peff@peff.net>
Date: Tue, 26 Feb 2013 20:18:20 GMT
Subject: Re: two-way merge corner case bug
Message-ID: <20130226201820.GD13830@sigill.intra.peff.net>
In-Reply-To: <7v7glun8kt.fsf@alter.siamese.dyndns.org>

On Tue, Feb 26, 2013 at 12:06:42PM -0800, Junio C Hamano wrote:

> It seems that we have a corner case bug in two-way merge to reset
> away the conflicts with "read-tree -u --reset HEAD ORIG_HEAD".

Isn't this a repeat of:

  http://thread.gmane.org/gmane.comp.version-control.git/202440/focus=212316

whose fix never got finalized? It's on my todo list, but it seems that
items keep sinking further down on that list, rather than getting
completed. :-/

-Peff