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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Andreas Jacobsen <andreas@xxxxxxxxxxxxxxxxxxx> writes:

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

Thanks, both.
--
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




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]