Re: [PATCH] git-am: add am.threeWay config variable

Paul Tan [off-list ref] writes:

On Tue, Aug 18, 2015 at 5:36 PM, Matthieu Moy
[off-list ref] wrote:

quoted

I don't remember the details of the regression we had with the shell
version, but that would probably deserve an additional test to enforce
the "Hopefully there will be no regressions" part of your message.

Actually, technically, I think this patch by its own would reintroduce
the regression ;)

The reason is that the bug was caused by the overall structure of the
git-am.sh code, and not the patch itself[1].

This is fixed in another patch series[2] on top of this patch which
also implements a test for "git am --3way".

OK, perfect. I had missed that. Thanks again.

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