Re: [PATCH] merge-tree: handle directory/empty conflict correctly

Andreas Jacobsen [off-list ref] writes:

On 6 May 2013 17:20, John Keeping [off-list ref] wrote:

quoted

Andreas, can you try this patch and see if it fixes your test case?

Worked perfectly. Thank you, John :)

Thanks, both.