Jeff King <peff@xxxxxxxx> writes: > Yeah, having to worry about two implementations of "git am" is a real > pain. If we are close on merging the builtin version, it makes sense to > me to hold off on the am.threeway feature until that is merged. Trying > to fix the ordering of the script that is going away isn't a good use of > anybody's time. So, the best option seems to be: 1) Revert d96a275 (git-am: add am.threeWay config variable, 2015-06-04) 2) Include the C port of d96a275 together with tests and docs verbatim from d96a275 into Paul's series. Actually, doing 1) is probably a good idea anyway, there's no reason to hold the release for such minor feature. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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