From: Anders Melchiorsen <mail@cup.kalibalik.dk>
Date: Fri, 14 Nov 2008 09:16:04 GMT
Subject: Re: [BUG] fatal error during merge
Message-ID: <38773.bFoQE3daRhY=.1226654164.squirrel@webmail.hotelhot.dk>
In-Reply-To: <20081114071636.GA4013@blimp.localdomain>

Alex Riesen wrote:

> And the patch isn't enough: the file Anders noticed missing is in the
> index (correctly) but somehow removed from worktree.  Which is maybe
> because it _still_ was a rename: 99% similarity. Well, just
> "yes | tail -nNN" usually producess very similar data :)

Maybe reducing the example all the way down to "touch" lost the implicit
information that, indeed, it has to be a rename for this to fail.


Anders.