From: Jeff King <peff@peff.net>
Date: Tue, 28 Oct 2014 22:21:08 GMT
Subject: Re: [PATCH] merge & sequencer: turn "Conflicts:" hint into a comment
Message-ID: <20141028222108.GB20722@peff.net>
In-Reply-To: <xmqqsii9qleh.fsf@gitster.dls.corp.google.com>

On Mon, Oct 27, 2014 at 01:59:18PM -0700, Junio C Hamano wrote:

> > I do not think it is too hard to teach strbuf_commented_addf() about
> > the leading HT, but that would be a separate topic; if squashing the
> > SP-HT to HT is worth doing for this codepath, doing it at that helper
> > would benefit all callers.
> 
> -- >8 --
> Subject: [PATCH] strbuf_add_lines(): avoid SP-HT sequence
> [...]

Thanks for doing this. I agree that this is the right place to put the
magic, and the patch looks obviously correct. I also double-checked it
with the "# Conflicts" patches and it addresses the problem I saw.

-Peff