From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Nov 2008 00:29:34 GMT
Subject: Re: [BUG] fatal error during merge
Message-ID: <7vfxlvf8up.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <48332.N1gUGH5fRhE=.1226619243.squirrel@webmail.hotelhot.dk>

"Anders Melchiorsen" <mail@cup.kalibalik.dk> writes:

> Your patch got rid of the errors and it commits the merged tree. But the
> working tree is not updated correctly, so the moved file disappears.

Isn't this a long known breakage of D/F conflict check logic in
merge-recursive backend?