On Tue, Jun 2, 2015 at 9:52 AM, Remi LESPINET <remi.lespinet@xxxxxxxxxxxxxxxxxxxxxxx> wrote: > Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes: > >> Remi Lespinet <remi.lespinet@xxxxxxxxxxxxxxxxxxxxxxx> 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.) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html