Daniel Barkalow <[EMAIL PROTECTED]> wrote: > I got mostly done with this before Linus mentioned the possibility of > having multiple index entries in the same stage for a single path. I > finished it anyway, but I'm not sure that we won't want to know which of > the common ancestors contributed which, and, if some of them don't have a > path, we wouldn't be able to tell.
I don't have time to look at the patch and I don't have a good knowledge of the GIT internals, so I will just ask. Does this patch changes the call convention for git-merge-one-file-script? I have my own script for StGIT and I would need to know whether it is affected or not. Thanks. -- Catalin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
