From: Luben Tuikov <ltuikov@yahoo.com>
Date: Wed, 23 Nov 2005 03:41:40 GMT
Subject: Re: Problem merging
Message-ID: <20051123034140.29993.qmail@web31801.mail.mud.yahoo.com>
In-Reply-To: <7v4q6483ms.fsf@assigned-by-dhcp.cox.net>

--- Junio C Hamano <junkio@cox.net> wrote:

> What does "git diff" and "git diff HEAD" tell you after the
> merge procedure leaves conflict in the working tree (branchB
> directory, I mean)?

Apparently include/asm-um/ldt.h has been renamed
and this was giving problems.

I had to manually git-update-index --force-remove that
file and then git resolve worked ok.

   Luben