Re: Another merge test case from the kernel tree.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:06
Daniel Barkalow [off-list ref] writes:
It shouldn't resolve it at all if it's case #16; I'll have to check on that.
Sorry my mistake; it did not.