[PATCH/RFC v2 2/2] git-am: add am.threeWay config variable

From: Remi LESPINET <remi.lespinet@ensimag.grenoble-inp.fr>
Date: Jun 2, 2015, 13:52 UTC
Message-ID: <87vbf6tdyu.fsf@ensimag.grenoble-inp.fr>
In-Reply-To: <vpqvbf6jko8.fsf@anie.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

Show 12 quoted lines

> 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