From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 07 May 2013 05:17:17 GMT
Subject: Re: [PATCH] merge-tree: handle directory/empty conflict correctly
Message-ID: <7v61yvnzc2.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CADEJa-5M3Pe+s+Df70AN5XS6UBWHr_BW3KZ4GKHm2d_GXNG+hA@mail.gmail.com>

Andreas Jacobsen <andreas@andreasjacobsen.com> writes:

> On 6 May 2013 17:20, John Keeping <john@keeping.me.uk> wrote:
>> Andreas, can you try this patch and see if it fixes your test case?
>
> Worked perfectly. Thank you, John :)

Thanks, both.