From: Eric Sunshine <sunshine@sunshineco.com>
Date: Sat, 18 Jul 2015 08:47:24 GMT
Subject: Re: [PATCH v3 06/18] rerere: drop want_sp parameter from is_cmarker()
Message-ID: <CAPig+cSwH_+htWqNphHsoP+SX8YCVS=PgN03m5z3ksSdeJE0kw@mail.gmail.com>
In-Reply-To: <3AAC96959AB14E61B7711B914D963B7F@PhilipOakley>

On Sat, Jul 18, 2015 at 4:24 AM, Philip Oakley <philipoakley@iee.org> wrote:
> From: "Junio C Hamano" <gitster@pobox.com>
>> As the nature of the conflict marker line determies if there should
>
> "should be a"?
> i.e. s/a /be a /    below

Also: s/determies/determines/