On 18/12/2007, Catalin Marinas <catalin.marinas@xxxxxxxxx> wrote: > On 18/12/2007, Karl Hasselström <kha@xxxxxxxxxxx> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
