From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Feb 2011 18:46:03 GMT
Subject: Re: libreoffice merge issue ...
Message-ID: <7vaahxp250.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110215094546.GA25530@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> Interesting. I looked at both sides of the merge and the merge base, and
> there definitely should not be a conflict there. The regression bisects
> to 83c9031 (unpack_trees(): skip trees that are the same in all input,
> 2010-12-22). Reverting that commit makes the problem go away.

Thanks; I was wondering about this myself but you bisected it faster.

Will revert.