From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Oct 2011 04:20:22 GMT
Subject: Re: What's cooking in git.git (Oct 2011, #05; Fri, 14)
Message-ID: <7v39esp7uh.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20111017033706.GA26326@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> What you queued in d5570f4 looks sane, but the merge into next is
> curious.

Thanks for spotting. I think I had rerere that recorded the conflict
resolution with an older iteration of the topic with looser message
default or something.