From: Elijah Newren <newren@gmail.com>
Date: Wed, 08 Sep 2010 06:41:26 GMT
Subject: Re: [PATCHv2 0/2] Fix resolvable rename + D/F conflict testcases
Message-ID: <AANLkTin0KidU3og7SVEVUAaRfMzafEvvme_vP-0V773E@mail.gmail.com>
In-Reply-To: <1283928041-9882-1-git-send-email-newren@gmail.com>

On Wed, Sep 8, 2010 at 12:40 AM, Elijah Newren <newren@gmail.com> 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.)