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

Matthieu Moy [off-list ref] writes:

Remi Lespinet [off-list ref] writes:

quoted

+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

On Tue, Jun 2, 2015 at 9:52 AM, Remi LESPINET
[off-list ref] wrote:

Matthieu Moy [off-list ref] writes:

quoted

Remi Lespinet [off-list ref] writes:

quoted

+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.)