Revert "git-am: add am.threeWay config variable"