Revert "git-am: add am.threeWay config variable"
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 17:55:24 +0000 (10:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 17:55:24 +0000 (10:55 -0700)
commit15dc5b5...b049bdf7abdbc610a5dec040c4d499bd
treec787e85...48802c968c62cd1b99f162174cb86c17copy hash to clipboard (tree)
parentf99a38c...121456822f8a9dfb7928eefceaa98201copy hash to clipboard (diff)
Documentation/config.txt
Documentation/git-am.txt
git-am.sh
t/t4150-am.sh