From: Andreas Jacobsen <andreas@andreasjacobsen.com>
Date: Tue, 07 May 2013 04:54:15 GMT
Subject: Re: [PATCH] merge-tree: handle directory/empty conflict correctly
Message-ID: <CADEJa-5M3Pe+s+Df70AN5XS6UBWHr_BW3KZ4GKHm2d_GXNG+hA@mail.gmail.com>
In-Reply-To: <20130506152054.GE25912@serenity.lan>

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 :)