From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Tue, 02 Jun 2015 13:37:27 GMT
Subject: Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable
Message-ID: <vpqvbf6jko8.fsf@anie.imag.fr>
In-Reply-To: <1433251472-29460-2-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr>

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.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/