From: Remi Lespinet Date: Wed, 03 Jun 2015 16:43:08 GMT Subject: [PATCH/RFC v3 4/4] git-am: add am.threeWay config variable Message-ID: <1224076916.87652.1433349788756.JavaMail.zimbra@ensimag.grenoble-inp.fr> In-Reply-To: Matthieu Moy writes > Remi Lespinet writes: > > > +am.threeWay:: > > + By default, git-am will fail if the patch does not apply cleanly. > > http://article.gmane.org/gmane.comp.version-control.git/270538 Ok sorry. Thanks