Re: Bizarre git merge behaviour

On 2013-11-20 13:29, Johannes Sixt wrote:
[...]

That's strange. I can't tell what is going on. Perhaps you have some
criss-cross merges in your history that merge-recursive trips over?

That's as good a guess as any, but I suspect tracking it down may
involve needles and haystacks...

Sorry, I don't know how to help you further.

No worries, thanks very much for your help so far nonetheless.

-- 
Regards,
Matthew Cengia