From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 19 Dec 2007 15:38:28 GMT
Subject: Re: kha/safe and kha/experimental updated
Message-ID: <b0943d9e0712190738o66005233v1ee908427ae619b8@mail.gmail.com>
In-Reply-To: <b0943d9e0712180809l4d2d01b8j32ab2a410885cc5e@mail.gmail.com>

On 18/12/2007, Catalin Marinas <catalin.marinas@gmail.com> wrote:
> On 18/12/2007, Karl Hasselström <kha@treskal.com> wrote:
> >       Fix "stg resolved" to work with new conflict representation
>
> For some reason, the interactive resolving keeps invoking the merger.
> I'll have a look.

I found the problem. git.ls_files() now returns all three stages if
there was a conflict and the file list got longer. I added a set to
remove the duplicates.

-- 
Catalin