Junio C Hamano [off-list ref] writes:

It is more than probable that it was what happened.  Will retry the
merge during the integration run I'll make later today.

Thanks.

And indeed, I had a mismerge.

Thanks, the topic is back in.