On Wed, Sep 8, 2010 at 12:40 AM, Elijah Newren <newren@xxxxxxxxx> wrote: > This fixes an issue reported by Nick (no lastname given) on the > mailing list, as well as a closely related issue in the handling of > rename + directory/file conflicts, namely where a filename on one side > of the rename is a directory name on the other side of the merge. > > Change since v1: > * Split unrelated 2/3 patch out into a separate submission ...oh, and now the series is based on master instead of next. (I would base it on maint, but since I was adding another testcase to t3509 and t3509 does not yet exist in maint, I couldn't as easily put it there.) -- 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