From: Anders Melchiorsen <mail@cup.kalibalik.dk>
Date: Mon, 11 May 2009 07:37:03 GMT
Subject: Re: [BUG] fatal error during merge
Message-ID: <41870.bFoQE3daRhY=.1242027423.squirrel@webmail.hotelhot.dk>
In-Reply-To: <20090510163336.GA27241@blimp.localdomain>

On Sun, 10 May 2009 18:33:36 +0200, Alex Riesen <raa.lkml@gmail.com> wrote:

> I still have the patch below (rebased) in my tree.
> Was the problem fixed somehow differently?

> Subject: [PATCH] Update index after refusing to rewrite files unchanged
> during merge

I tested recently, and it does not appear to be fixed yet.

However, your patch was not enough to fix my test case completely,
so I am unsure whether it makes sense to apply it as a partial fix.

The test is here:

   http://article.gmane.org/gmane.comp.version-control.git/116999


Anders.