From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Wed, 03 Jun 2015 16:31:18 GMT
Subject: Re: [PATCH/RFC v3 4/4] git-am: add am.threeWay config variable
Message-ID: <vpqvbf4da95.fsf@anie.imag.fr>
In-Reply-To: <1433266446-2845-4-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr>

Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> 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

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