From: Eric Sunshine <sunshine@sunshineco.com>
Date: Tue, 02 Jun 2015 14:01:08 GMT
Subject: Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable
Message-ID: <CAPig+cQZCekq+7UuO8t7+xxU0SR0t42zNn10gY1B5kVeeh7buQ@mail.gmail.com>
In-Reply-To: <87vbf6tdyu.fsf@ensimag.grenoble-inp.fr>

On Tue, Jun 2, 2015 at 9:52 AM, Remi LESPINET
<remi.lespinet@ensimag.grenoble-inp.fr> wrote:
> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>
>> Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> writes:
>>
>> > +if test "$(git config --bool --get am.threeWay)" = true
>> > +then
>> > +    threeway=t
>> > +fi
>>
>> I think you missed Paul's remark on this:
>>
>> http://article.gmane.org/gmane.comp.version-control.git/270150
>>
>> Not terribly important since am will be rewritten soon, though.
>
> Oh right, sorry about that, I modify it and I resend the patch asap

In fact, it looks like all of Paul's remarks were missed. (The bit at
the bottom of his review is also important.)