Junio C Hamano 15dc5b5fb0 Revert "git-am: add am.threeWay config variable" ...

This reverts commit d96a275b91.

It used to be possible to apply a patch series with "git am mbox"
and then only after seeing a failure, switch to three-way mode via
"git am -3" (no other options or arguments).  The commit being
reverted broke this workflow.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

2015-07-24 10:55:24 -07:00

7.0 KiB

Raw Blame History

View Raw