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 -- 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